diff --git a/src/configuration.h b/src/configuration.h
index c48a279bc..e2fd3f44d 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -100,10 +100,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
 // -----------------------------------------------------------------------------
@@ -118,6 +114,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..4b0baee66 100644
--- a/src/gps/NMEAGPS.cpp
+++ b/src/gps/NMEAGPS.cpp
@@ -26,8 +26,8 @@ bool NMEAGPS::factoryReset()
             0xFF, 0xFF, 0x00, 0x00, 0x17, 0x2B, 0x7E};
         _serial_gps->write(_message_reset,sizeof(_message_reset));
         delay(1000);
-        return true;
 #endif
+return true;
 }
 
 bool NMEAGPS::setupGPS()