diff --git a/GUI.cpp b/GUI.cpp
index 6610d762..62fee603 100644
--- a/GUI.cpp
+++ b/GUI.cpp
@@ -511,7 +511,7 @@ namespace
     {
         auto& ssConfig = stonesenseState.ssConfig;
         Crd3D& selection = segment->segState.dfSelection;
-        if ((selection.x != -30000 && ssConfig.config.follow_DFcursor)) {
+        if ((selection.x >=0 && ssConfig.config.follow_DFcursor)) {
             drawCursorAt(segment, selection, uiColor(3));
         }
         else {
@@ -947,7 +947,7 @@ void paintboard()
         }
         if(ssConfig.config.follow_DFcursor && ssConfig.config.debug_mode) {
             top += fontHeight;
-            if(segment->segState.dfCursor.x != -30000) {
+            if(segment->segState.dfCursor.x >=0) {
                 draw_textf_border(font, uiColor(1), ssState.ScreenW/2,top, ALLEGRO_ALIGN_CENTRE, "Following DF Cursor at: %d,%d,%d", segment->segState.dfCursor.x,segment->segState.dfCursor.y,segment->segState.dfCursor.z);
             }
         }
diff --git a/TrackingModes.cpp b/TrackingModes.cpp
index 68eb2f1e..8e7ebd47 100644
--- a/TrackingModes.cpp
+++ b/TrackingModes.cpp
@@ -28,7 +28,7 @@ void followCurrentDFFocus()
     auto& ssConfig = stonesenseState.ssConfig;
     auto& ssState = stonesenseState.ssState;
 
-    if(ssState.dfCursor.x != -30000) {
+    if(ssState.dfCursor.x >=0) {
         ssState.Position.x = ssState.dfCursor.x - (ssState.Size.x / 2) + ssConfig.config.viewOffset.x;
         ssState.Position.y = ssState.dfCursor.y - (ssState.Size.y / 2) + ssConfig.config.viewOffset.y;
         ssState.Position.z = ssState.dfCursor.z + ssConfig.config.viewOffset.z + 1;