diff --git a/NewHorizons/Builder/Body/CloakBuilder.cs b/NewHorizons/Builder/Body/CloakBuilder.cs
index fa34415b..9a509517 100644
--- a/NewHorizons/Builder/Body/CloakBuilder.cs
+++ b/NewHorizons/Builder/Body/CloakBuilder.cs
@@ -11,7 +11,7 @@ namespace NewHorizons.Builder.Body
 {
     public static class CloakBuilder
     {
-        public static void Make(GameObject planetGO, Sector sector, float radius)
+        public static void Make(GameObject planetGO, Sector sector, OWRigidbody OWRB, float radius)
         {
             var cloak = SearchUtilities.Find("RingWorld_Body/CloakingField_IP");
 
@@ -28,7 +28,7 @@ namespace NewHorizons.Builder.Body
             cloakFieldController._innerCloakRadius = radius * 900 / 3000f;
             cloakFieldController._nearCloakRadius = radius * 800 / 3000f;
 
-            cloakFieldController._referenceFrameVolume = planetGO.GetAttachedOWRigidbody()?._attachedRFVolume;
+            cloakFieldController._referenceFrameVolume = OWRB._attachedRFVolume;
             cloakFieldController._exclusionSector = null;
 
             var cloakSectorController = newCloak.AddComponent<CloakSectorController>();
diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs
index 5ae66008..85ee64af 100644
--- a/NewHorizons/Handlers/PlanetCreationHandler.cs
+++ b/NewHorizons/Handlers/PlanetCreationHandler.cs
@@ -498,7 +498,7 @@ namespace NewHorizons.Handlers
             // Has to go last probably
             if (body.Config.Base.CloakRadius != 0f)
             {
-                CloakBuilder.Make(go, sector, body.Config.Base.CloakRadius);
+                CloakBuilder.Make(go, sector, rb, body.Config.Base.CloakRadius);
             }
 
             return go;