diff --git a/src/navparser.cpp b/src/navparser.cpp
index 2362f8ed..9d41646c 100644
--- a/src/navparser.cpp
+++ b/src/navparser.cpp
@@ -455,11 +455,11 @@ CNavArea *findClosestNavSquare(const Vector &vec)
         ovBestDist   = dist;
         ovBestSquare = &i;
     }
-    if (bestSquare)
+    if (!ovBestSquare)
         ovBestSquare = bestSquare;
 
     if (isLocal)
-        findClosestNavSquare_localAreas.push_back(bestSquare);
+        findClosestNavSquare_localAreas.push_back(ovBestSquare);
 
     return ovBestSquare;
 }