     gps.course.isValid()     &&
     gps.date.isValid()       &&
     gps.time.isValid()       &&
-    gps.satellites.isValid();
+    gps.satellites.isValid() &&
+    gps.hdop.isValid();
 
   // Check if the GPS data is valid or data valid override is set (for debugging)
   if (dataValid || dataValidOverride) {

    else {
      lcd.print("         "); // Clear the extra chars
    }
#endif // #ifndef CONVERT_TO_LOCAL
    lcd.setCursor (0, 2); // Go to 3rd line
    lcd.print("Spd: ");

    GPSData.altitude   = gps.altitude.feet();
#ifndef _16x2
    GPSData.heading    = gps.course.deg();
    GPSData.hdop       = gps.hdop.value();
    GPSData.year       = gps.date.year();
    GPSData.month      = gps.date.month();
    GPSData.day        = gps.date.day();
