diff --git a/src/configuration.h b/src/configuration.h
index 7ae279736..16262d97f 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -107,10 +107,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define GPS_TX_PIN 12
 #endif
 
-#ifndef TTGO_T_ECHO
-#define GPS_UBLOX
-#endif
-
 // -----------------------------------------------------------------------------
 // LoRa SPI
 // -----------------------------------------------------------------------------
@@ -125,6 +121,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #endif
 
+#ifndef TTGO_T_ECHO
+#define GPS_UBLOX
+#endif
+
 //
 // Standard definitions for !ESP32 targets
 //
diff --git a/src/gps/NMEAGPS.cpp b/src/gps/NMEAGPS.cpp
index 6e6a1f513..98b7834f9 100644
--- a/src/gps/NMEAGPS.cpp
+++ b/src/gps/NMEAGPS.cpp
@@ -20,14 +20,14 @@ static int32_t toDegInt(RawDegrees d)
 bool NMEAGPS::factoryReset()
 {
 #ifdef GPS_UBLOX
-        // Factory Reset
-        byte _message_reset[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0xFF,
-            0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0xFF, 0xFF, 0x00, 0x00, 0x17, 0x2B, 0x7E};
-        _serial_gps->write(_message_reset,sizeof(_message_reset));
-        delay(1000);
-        return true;
+    // Factory Reset
+    byte _message_reset[] = {0xB5, 0x62, 0x06, 0x09, 0x0D, 0x00, 0xFF,
+        0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0xFF, 0xFF, 0x00, 0x00, 0x17, 0x2B, 0x7E};
+    _serial_gps->write(_message_reset,sizeof(_message_reset));
+    delay(1000);
 #endif
+    return true;
 }
 
 bool NMEAGPS::setupGPS()