diff --git a/radio/src/gui/128x64/model_failsafe.cpp b/radio/src/gui/128x64/model_failsafe.cpp
index 8c8b6aa3c..ce7699ffe 100644
--- a/radio/src/gui/128x64/model_failsafe.cpp
+++ b/radio/src/gui/128x64/model_failsafe.cpp
@@ -54,9 +54,9 @@ void menuModelFailsafe(event_t event)
   lcdDrawTextAlignedCenter(0, FAILSAFESET);
   lcdInvertLine(0);
 
-  for (uint8_t i=0; i<LCD_LINES-1; i++) {
+  for (uint8_t i=0; i<NUM_BODY_LINES; i++) {
     coord_t y = MENU_HEADER_HEIGHT + 1 + i * FH;
-    uint8_t k = i + menuVerticalOffset + HEADER_LINE;
+    uint8_t k = i + menuVerticalOffset;
     LcdFlags attr = (sub == k) ? INVERS : 0;
 
     uint8_t wbar = LCD_W - FW * 4 - FWNUM * 4;
@@ -77,7 +77,7 @@ void menuModelFailsafe(event_t event)
     int32_t failsafeValue = g_model.failsafeChannels[k];
 
     // Channel
-    putsChn(0, y, k, SMLSIZE);
+    putsChn(0, y, k + 1, SMLSIZE);
 
     // Value
     LcdFlags flags = TINSIZE;
diff --git a/tools/build-frsky.py b/tools/build-frsky.py
index e997de679..3787352fb 100755
--- a/tools/build-frsky.py
+++ b/tools/build-frsky.py
@@ -20,6 +20,7 @@ options = {
     }
 }
 
+
 def timestamp():
     return datetime.datetime.now().strftime("%y%m%d")