diff --git a/src/main/resources/zonemaps/map01.json b/src/main/resources/zonemaps/map01.json
index b8c3259a3..a2eef1712 100644
--- a/src/main/resources/zonemaps/map01.json
+++ b/src/main/resources/zonemaps/map01.json
@@ -10395,7 +10395,7 @@
     "AbsY": 6098.764,
     "AbsZ": 51.7350044,
     "Yaw": 275.0,
-    "GUID": 824,
+    "GUID": 827,
     "MapID": null,
     "IsChildObject": true
   },
@@ -10408,7 +10408,7 @@
     "AbsY": 1906.30212,
     "AbsZ": 77.93733,
     "Yaw": 168.0,
-    "GUID": 825,
+    "GUID": 824,
     "MapID": null,
     "IsChildObject": true
   },
@@ -10421,7 +10421,7 @@
     "AbsY": 1906.30212,
     "AbsZ": 87.93733,
     "Yaw": 168.0,
-    "GUID": 826,
+    "GUID": 825,
     "MapID": null,
     "IsChildObject": true
   },
@@ -10434,7 +10434,7 @@
     "AbsY": 1906.30212,
     "AbsZ": 107.937332,
     "Yaw": 168.0,
-    "GUID": 827,
+    "GUID": 826,
     "MapID": null,
     "IsChildObject": true
   },
diff --git a/src/main/scala/net/psforever/zones/Zones.scala b/src/main/scala/net/psforever/zones/Zones.scala
index 2b0a7738f..b6865b06f 100644
--- a/src/main/scala/net/psforever/zones/Zones.scala
+++ b/src/main/scala/net/psforever/zones/Zones.scala
@@ -312,8 +312,8 @@ object Zones {
             val filteredZoneEntities =
               data.filter { _.owner.contains(structure.id) } ++
               {
-                val structurePosition = structure.position
                 if (structure.objectType.startsWith("orbital_building_")) {
+                  val structurePosition = structure.position
                   data.filter { entity =>
                     entity.objectType.startsWith("bfr_") &&
                     Vector3.DistanceSquared(entity.position, structurePosition) < 160000f