diff --git a/src/emucore/CartDetector.cxx b/src/emucore/CartDetector.cxx
index 8d4f5f51b..1e37a961f 100644
--- a/src/emucore/CartDetector.cxx
+++ b/src/emucore/CartDetector.cxx
@@ -133,6 +133,10 @@ Bankswitch::Type CartDetector::autodetectType(const ByteBuffer& image, size_t si
   {
     if (isProbablyCTY(image, size))
       type = Bankswitch::Type::_CTY;
+    else if(isProbablyCDF(image, size))
+      type = Bankswitch::Type::_CDF;
+    else if(isProbablyDPCplus(image, size))
+      type = Bankswitch::Type::_DPCP;
     else if(isProbablySC(image, size))
       type = Bankswitch::Type::_F4SC;
     else if(isProbably3EX(image, size))
@@ -143,10 +147,6 @@ Bankswitch::Type CartDetector::autodetectType(const ByteBuffer& image, size_t si
       type = Bankswitch::Type::_3F;
     else if (isProbablyBUS(image, size))
       type = Bankswitch::Type::_BUS;
-    else if (isProbablyCDF(image, size))
-      type = Bankswitch::Type::_CDF;
-    else if(isProbablyDPCplus(image, size))
-      type = Bankswitch::Type::_DPCP;
     else if(isProbablyFA2(image, size))
       type = Bankswitch::Type::_FA2;
     else if (isProbablyFC(image, size))
@@ -165,12 +165,12 @@ Bankswitch::Type CartDetector::autodetectType(const ByteBuffer& image, size_t si
   {
     if(isProbably3EX(image, size))
       type = Bankswitch::Type::_3EX;
+    else if (isProbablyCDF(image, size))
+      type = Bankswitch::Type::_CDF;
     else if(isProbably3E(image, size))
       type = Bankswitch::Type::_3E;
     else if(isProbably3F(image, size))
       type = Bankswitch::Type::_3F;
-    else if (isProbablyCDF(image, size))
-      type = Bankswitch::Type::_CDF;
     else if(isProbably4A50(image, size))
       type = Bankswitch::Type::_4A50;
     else if(isProbablyEF(image, size, type))
@@ -194,6 +194,8 @@ Bankswitch::Type CartDetector::autodetectType(const ByteBuffer& image, size_t si
       type = Bankswitch::Type::_CDF;
     else if(isProbably4A50(image, size))
       type = Bankswitch::Type::_4A50;
+    else if(isProbablyCDF(image, size))
+      type = Bankswitch::Type::_CDF;
     else /*if(isProbablySB(image, size))*/
       type = Bankswitch::Type::_SB;
   }