diff --git a/CommandDistributor.cpp b/CommandDistributor.cpp
index 43ccd7f..c318ae6 100644
--- a/CommandDistributor.cpp
+++ b/CommandDistributor.cpp
@@ -355,11 +355,11 @@ void CommandDistributor::broadcastTrackState(const FSH* format, byte trackLetter
   broadcastReply(COMMAND_TYPE, format, trackLetter, modename, dcAddr);
 }
 
-void  CommandDistributor::broadcastRouteState(uint16_t routeId, byte state ) {
+void  CommandDistributor::broadcastRouteState(int16_t routeId, byte state ) {
   broadcastReply(COMMAND_TYPE, F("<jB %d %d>\n"),routeId,state);
 }
 
-void  CommandDistributor::broadcastRouteCaption(uint16_t routeId, const FSH* caption ) {
+void  CommandDistributor::broadcastRouteCaption(int16_t routeId, const FSH* caption ) {
   broadcastReply(COMMAND_TYPE, F("<jB %d \"%S\">\n"),routeId,caption);
 }
 
diff --git a/CommandDistributor.h b/CommandDistributor.h
index 4fba277..01966e3 100644
--- a/CommandDistributor.h
+++ b/CommandDistributor.h
@@ -60,8 +60,8 @@ public :
   static void broadcastTrackState(const FSH* format,byte trackLetter, const FSH* modename, int16_t dcAddr);
   template<typename... Targs> static void broadcastReply(clientType type, Targs... msg);
   static void forget(byte clientId);
-  static void broadcastRouteState(uint16_t routeId,byte state);
-  static void broadcastRouteCaption(uint16_t routeId,const FSH * caption);
+  static void broadcastRouteState(int16_t routeId,byte state);
+  static void broadcastRouteCaption(int16_t routeId,const FSH * caption);
   static void broadcastMessage(char * message);
   
   // Handling code for virtual LCD receiver.
diff --git a/EXRAIL2.cpp b/EXRAIL2.cpp
index 8b41688..02f6232 100644
--- a/EXRAIL2.cpp
+++ b/EXRAIL2.cpp
@@ -1557,7 +1557,7 @@ void RMFT2::thrungeString(uint32_t strfar, thrunger mode, byte id) {
     }
 }
 
-void RMFT2::manageRouteState(uint16_t id, byte state) {
+void RMFT2::manageRouteState(int16_t id, byte state) {
   if (compileFeatures && FEATURE_ROUTESTATE) {
     // Route state must be maintained for when new throttles connect.
     // locate route id in the Routes lookup
@@ -1569,7 +1569,7 @@ void RMFT2::manageRouteState(uint16_t id, byte state) {
     CommandDistributor::broadcastRouteState(id,state);
   }
 }
-void RMFT2::manageRouteCaption(uint16_t id,const FSH* caption) {
+void RMFT2::manageRouteCaption(int16_t id,const FSH* caption) {
   if (compileFeatures && FEATURE_ROUTESTATE) {
     // Route state must be maintained for when new throttles connect.
     // locate route id in the Routes lookup
diff --git a/EXRAIL2.h b/EXRAIL2.h
index 82b9839..93552ef 100644
--- a/EXRAIL2.h
+++ b/EXRAIL2.h
@@ -279,8 +279,8 @@ private:
    static const int countLCCLookup;
    static int onLCCLookup[];
    static const byte compileFeatures;
-   static void manageRouteState(uint16_t id, byte state);
-   static void manageRouteCaption(uint16_t id, const FSH* caption);
+   static void manageRouteState(int16_t id, byte state);
+   static void manageRouteCaption(int16_t id, const FSH* caption);
    static byte * routeStateArray;
    static const FSH ** routeCaptionArray;
    static int16_t * stashArray;