diff --git a/gpsd_client/src/client.cpp b/gpsd_client/src/client.cpp
index 6de5888..3d306f8 100644
--- a/gpsd_client/src/client.cpp
+++ b/gpsd_client/src/client.cpp
@@ -177,12 +177,12 @@ namespace gpsd_client
       }
 #if GPSD_API_MAJOR_VERSION >= 10
 #ifdef STATUS_FIX
-      if ((p->fix.status != STATUS_NO_FIX) && !(check_fix_by_variance_ && std::isnan(p->fix.epx)))
+      if (((p->fix.mode == MODE_2D) || (p->fix.mode == MODE_3D)) && !(check_fix_by_variance_ && std::isnan(p->fix.epx)))
 #else
-      if ((p->fix.status != STATUS_NO_FIX) && !(check_fix_by_variance_ && std::isnan(p->fix.epx)))
+      if (((p->fix.mode == MODE_2D) || (p->fix.mode == MODE_3D)) && !(check_fix_by_variance_ && std::isnan(p->fix.epx)))
 #endif
 #else
-      if ((p->status != STATUS_NO_FIX) && !(check_fix_by_variance_ && std::isnan(p->fix.epx)))
+      if (((p->fix.mode == MODE_2D) || (p->fix.mode == MODE_3D)) && !(check_fix_by_variance_ && std::isnan(p->fix.epx)))
 #endif
       {
         status.status = 0; // FIXME: gpsmm puts its constants in the global
@@ -208,7 +208,14 @@ namespace gpsd_client
 #endif
         fix.latitude = p->fix.latitude;
         fix.longitude = p->fix.longitude;
-        fix.altitude = p->fix.altitude;
+        if (p->fix.mode == MODE_3D)
+        {
+          fix.altitude = p->fix.altitude;
+        }
+        else
+        {
+          fix.altitude = std::nan("");
+        }
         fix.track = p->fix.track;
         fix.speed = p->fix.speed;
         fix.climb = p->fix.climb;