diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp
index 31a0de6..374d546 100644
--- a/EXRAIL2.cpp
+++ b/EXRAIL2.cpp
@@ -265,16 +265,17 @@ void RMFT2::setTurnoutHiddenState(Turnout * t) {
 char RMFT2::getRouteType(int16_t id) {
   for (int16_t i=0;;i+=2) {
     int16_t rid= GETHIGHFLASHW(routeIdList,i);
-    if (rid==id) return 'R';
     if (rid==0) break;
+    if (rid==id) return 'R';
   }
   for (int16_t i=0;;i+=2) {
     int16_t rid= GETHIGHFLASHW(automationIdList,i);
-    if (rid==id) return 'A';
     if (rid==0) break;
+    if (rid==id) return 'A';
   }
   return 'X';
-}   
+}
+
 // This filter intercepts <> commands to do the following:
 // - Implement RMFT specific commands/diagnostics
 // - Reject/modify JMRI commands that would interfere with RMFT processing
diff --git a/version.h b/version.h
index 385c5f2..f168477 100644
--- a/version.h
+++ b/version.h
@@ -4,7 +4,8 @@
 #include "StringFormatter.h"
 
 
-#define VERSION "4.2.46"
+#define VERSION "4.2.47"
+// 4.2.47 - Correct response to <JA 0>
 // 4.2.46 - Support boards with inverted fault pin
 // 4.2.45 - Add ONCLOCKMINS to FastClock to allow hourly repeat events
 // 4.2.44 - Add PowerShell installer EX-CommandStation-installer.exe