diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index cb740db6c..e6eb47686 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -708,7 +708,7 @@ void menuProcModel(uint8_t event)
           for (uint8_t i=1; i<7; i++) {
             attr = 0;
             if (i == 4) {
-              c = '0'+(states & 0x03)-1;
+              c = '0'+(states & 0x03);
               states >>= 2;
             }
             else {
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 205ee394d..57e9e96c2 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -601,7 +601,7 @@ int8_t getMovedSwitch()
       prev = (switches_states & mask);
     }
     else if (i <= 6) {
-      prev = ((switches_states & 0x18) == ((i-3) << 3));
+      prev = ((switches_states & 0x18) == ((i-4) << 3));
     }
     else {
       mask = (1<<(i-2));
@@ -614,7 +614,7 @@ int8_t getMovedSwitch()
       if (mask)
         switches_states ^= mask;
       else
-        switches_states = (switches_states & 0xE7) | ((i-3) << 3);
+        switches_states = (switches_states & 0xE7) | ((i-4) << 3);
     }
   }