diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde
index 79e9c8cc6d..13aa4c0ecf 100644
--- a/ArduPlane/ArduPlane.pde
+++ b/ArduPlane/ArduPlane.pde
@@ -107,6 +107,7 @@ static Parameters g;
 // prototypes
 static void update_events(void);
 void gcs_send_text_fmt(const prog_char_t *fmt, ...);
+static void print_flight_mode(AP_HAL::BetterStream *port, uint8_t mode);
 
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/ArduPlane/Log.pde b/ArduPlane/Log.pde
index 3ee770b401..0adb9366f0 100644
--- a/ArduPlane/Log.pde
+++ b/ArduPlane/Log.pde
@@ -458,7 +458,9 @@ static void Log_Read(uint16_t log_num, int16_t start_page, int16_t end_page)
 
 	DataFlash.LogReadProcess(log_num, start_page, end_page, 
                              sizeof(log_structure)/sizeof(log_structure[0]),
-                             log_structure, cliSerial);
+                             log_structure, 
+                             print_flight_mode,
+                             cliSerial);
 }
 
 // start a new log
diff --git a/ArduPlane/setup.pde b/ArduPlane/setup.pde
index af896fa7aa..ac9a7c3493 100644
--- a/ArduPlane/setup.pde
+++ b/ArduPlane/setup.pde
@@ -561,7 +561,8 @@ static void
 print_switch(uint8_t p, uint8_t m)
 {
     cliSerial->printf_P(PSTR("Pos %d: "),p);
-    print_flight_mode(m);
+    print_flight_mode(cliSerial, m);
+    cliSerial->println();
 }
 
 static void
diff --git a/ArduPlane/system.pde b/ArduPlane/system.pde
index 3dbe583723..154e631c46 100644
--- a/ArduPlane/system.pde
+++ b/ArduPlane/system.pde
@@ -594,38 +594,38 @@ static void reboot_apm(void)
 
 
 static void
-print_flight_mode(uint8_t mode)
+print_flight_mode(AP_HAL::BetterStream *port, uint8_t mode)
 {
     switch (mode) {
     case MANUAL:
-        cliSerial->println_P(PSTR("Manual"));
+        port->print_P(PSTR("Manual"));
         break;
     case CIRCLE:
-        cliSerial->println_P(PSTR("Circle"));
+        port->print_P(PSTR("Circle"));
         break;
     case STABILIZE:
-        cliSerial->println_P(PSTR("Stabilize"));
+        port->print_P(PSTR("Stabilize"));
         break;
     case TRAINING:
-        cliSerial->println_P(PSTR("Training"));
+        port->print_P(PSTR("Training"));
         break;
     case FLY_BY_WIRE_A:
-        cliSerial->println_P(PSTR("FBW_A"));
+        port->print_P(PSTR("FBW_A"));
         break;
     case FLY_BY_WIRE_B:
-        cliSerial->println_P(PSTR("FBW_B"));
+        port->print_P(PSTR("FBW_B"));
         break;
     case AUTO:
-        cliSerial->println_P(PSTR("AUTO"));
+        port->print_P(PSTR("AUTO"));
         break;
     case RTL:
-        cliSerial->println_P(PSTR("RTL"));
+        port->print_P(PSTR("RTL"));
         break;
     case LOITER:
-        cliSerial->println_P(PSTR("Loiter"));
+        port->print_P(PSTR("Loiter"));
         break;
     default:
-        cliSerial->println_P(PSTR("---"));
+        port->printf_P(PSTR("Mode(%u)"), (unsigned)mode);
         break;
     }
 }
diff --git a/ArduPlane/test.pde b/ArduPlane/test.pde
index c8539fa85b..b8e8ab8f5d 100644
--- a/ArduPlane/test.pde
+++ b/ArduPlane/test.pde
@@ -227,13 +227,15 @@ test_failsafe(uint8_t argc, const Menu::arg *argv)
 
         if(oldSwitchPosition != readSwitch()) {
             cliSerial->printf_P(PSTR("CONTROL MODE CHANGED: "));
-            print_flight_mode(readSwitch());
+            print_flight_mode(cliSerial, readSwitch());
+            cliSerial->println();
             fail_test++;
         }
 
         if(g.throttle_fs_enabled && g.channel_throttle.get_failsafe()) {
             cliSerial->printf_P(PSTR("THROTTLE FAILSAFE ACTIVATED: %d, "), (int)g.channel_throttle.radio_in);
-            print_flight_mode(readSwitch());
+            print_flight_mode(cliSerial, readSwitch());
+            cliSerial->println();
             fail_test++;
         }