diff --git a/radio/src/gui/navigation/navigation_9x.cpp b/radio/src/gui/navigation/navigation_9x.cpp
index db9b34d4e..74380a69b 100644
--- a/radio/src/gui/navigation/navigation_9x.cpp
+++ b/radio/src/gui/navigation/navigation_9x.cpp
@@ -136,7 +136,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
 #if defined(AUTOSWITCH)
       else {
         uint8_t swtch = abs(getMovedSwitch());
-        if (swtch && !IS_SWITCH_MULTPOS(swtch)) {
+        if (swtch && !IS_SWITCH_MULTIPOS(swtch)) {
           newval = switchToMix(swtch);
         }
       }
diff --git a/radio/src/gui/navigation/navigation_horus.cpp b/radio/src/gui/navigation/navigation_horus.cpp
index 07c53ae1d..9679ab6e7 100644
--- a/radio/src/gui/navigation/navigation_horus.cpp
+++ b/radio/src/gui/navigation/navigation_horus.cpp
@@ -137,7 +137,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
 #if defined(AUTOSWITCH)
       else {
         unsigned int swtch = abs(getMovedSwitch());
-        if (swtch && !IS_SWITCH_MULTPOS(swtch)) {
+        if (swtch && !IS_SWITCH_MULTIPOS(swtch)) {
           newval = switchToMix(swtch);
         }
       }
diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp
index 3d58c619b..ecf00a02b 100644
--- a/radio/src/gui/navigation/navigation_x7.cpp
+++ b/radio/src/gui/navigation/navigation_x7.cpp
@@ -106,7 +106,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
 #if defined(AUTOSWITCH)
       else {
         unsigned int swtch = abs(getMovedSwitch());
-        if (swtch && !IS_SWITCH_MULTPOS(swtch)) {
+        if (swtch && !IS_SWITCH_MULTIPOS(swtch)) {
           newval = switchToMix(swtch);
         }
       }
diff --git a/radio/src/gui/navigation/navigation_x9d.cpp b/radio/src/gui/navigation/navigation_x9d.cpp
index e0a7a9dae..2b3587cba 100644
--- a/radio/src/gui/navigation/navigation_x9d.cpp
+++ b/radio/src/gui/navigation/navigation_x9d.cpp
@@ -173,7 +173,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
 #if defined(AUTOSWITCH)
       else {
         unsigned int swtch = abs(getMovedSwitch());
-        if (swtch && !IS_SWITCH_MULTPOS(swtch)) {
+        if (swtch && !IS_SWITCH_MULTIPOS(swtch)) {
           newval = switchToMix(swtch);
         }
       }
diff --git a/radio/src/gui/navigation/navigation_xlite.cpp b/radio/src/gui/navigation/navigation_xlite.cpp
index 4a914a1d3..974308f1b 100644
--- a/radio/src/gui/navigation/navigation_xlite.cpp
+++ b/radio/src/gui/navigation/navigation_xlite.cpp
@@ -166,7 +166,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
 #if defined(AUTOSWITCH)
       else {
         uint8_t swtch = abs(getMovedSwitch());
-        if (swtch && !IS_SWITCH_MULTPOS(swtch)) {
+        if (swtch && !IS_SWITCH_MULTIPOS(swtch)) {
           newval = switchToMix(swtch);
         }
       }
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index c473fc67a..64e5e5419 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -557,7 +557,7 @@ bool isInputRecursive(int index)
 }
 
 #if defined(AUTOSOURCE)
-constexpr int MULTIPOS_STEP_SIZE = (2 * RESX) / (XPOTS_MULTIPOS_COUNT + 1);
+constexpr int MULTIPOS_STEP_SIZE = (2 * RESX) / (XPOTS_MULTIPOS_COUNT - 1);
 
 int8_t getMovedSource(GET_MOVED_SOURCE_PARAMS)
 {
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index 652c26409..2580aa653 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -283,9 +283,9 @@ void memswap(void * a, void * b, uint8_t size);
 #endif
 
 #if NUM_XPOTS > 0
-  #define IS_SWITCH_MULTPOS(x)         (SWSRC_FIRST_MULTIPOS_SWITCH <= (x) && (x) <= SWSRC_LAST_MULTIPOS_SWITCH)
+  #define IS_SWITCH_MULTIPOS(x)         (SWSRC_FIRST_MULTIPOS_SWITCH <= (x) && (x) <= SWSRC_LAST_MULTIPOS_SWITCH)
 #else
-  #define IS_SWITCH_MULTPOS(x)         (false)
+  #define IS_SWITCH_MULTIPOS(x)         (false)
 #endif
 
 #if defined(PWR_BUTTON_PRESS)