diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 333bb3c02..899ec21a3 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -2215,7 +2215,7 @@ void menuProcFunctionSwitches(uint8_t event)
             }
             else if (sd->func == FUNC_PLAY_VALUE) {
               val_max = NUM_XCHNPLAY;
-              putsChnRaw(17*FW, y, val_displayed, attr);
+              putsChnRaw(17*FW, y, val_displayed+1, attr);
             }
 #endif
             else if (sd->func == FUNC_RESET) {
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 34790876c..4ae056e9d 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -1523,7 +1523,7 @@ void playValue(uint8_t idx)
     default:
     {
       uint8_t unit;
-      if (idx <= NUM_XCHNRAW+TELEM_GPSALT-1)
+      if (idx >= NUM_XCHNRAW && idx <= NUM_XCHNRAW+TELEM_GPSALT-1)
         unit = idx - NUM_XCHNRAW - 6;
       else if (idx >= NUM_XCHNRAW+TELEM_MAX_T1-1 && idx <= NUM_XCHNRAW+TELEM_MAX_DIST-1)
         unit = idx - NUM_XCHNRAW - 22;