diff --git a/src/Makefile b/src/Makefile
index de424d696..6e2584e3e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -49,7 +49,7 @@ NAVIGATION = NO
 
 # Switches autmatic selection
 # Values = YES, NO 
-AUTOSWITCH = YES
+AUTOSWITCH = NO
 
 # AUDIO Mods
 # Values = YES, NO 
@@ -230,7 +230,7 @@ ifeq ($(NAVIGATION), POTS)
   CPPDEFS += -DNAVIGATION_POT1 -DNAVIGATION_POT2 -DNAVIGATION_POT3
 endif
 
-ifeq ($(AUTOSWITCH), NO)
+ifeq ($(AUTOSWITCH), YES)
   CPPDEFS += -DAUTOSWITCH
 endif
 
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 9690b683f..af1608a7b 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -610,7 +610,7 @@ int8_t getMovedSwitch()
       prev = (switches_states & mask);
     }
     else if (i <= 6) {
-      prev = ((switches_states & 0b00011000) == ((i-3) << 3));
+      prev = ((switches_states & 0x18) == ((i-3) << 3));
     }
     else {
       mask = (1<<(i-2));
@@ -622,7 +622,7 @@ int8_t getMovedSwitch()
       if (mask)
         switches_states ^= mask;
       else
-        switches_states = (switches_states & 0b11100111) | ((i-3) << 3);
+        switches_states = (switches_states & 0xE7) | ((i-3) << 3);
     }
   }