diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs
index 0d6f7b3b..a09c83d8 100644
--- a/NewHorizons/Builder/Props/DetailBuilder.cs
+++ b/NewHorizons/Builder/Props/DetailBuilder.cs
@@ -314,7 +314,8 @@ namespace NewHorizons.Builder.Props
 
             if (component is DarkMatterSubmergeController submergeController)
             {
-                submergeController._fluidDetector?.SetDetectableFluid(planetGO.GetComponentInChildren<RadialFluidVolume>());
+                var water = planetGO.GetComponentsInChildren<RadialFluidVolume>().FirstOrDefault(x => x._fluidType == FluidVolume.Type.WATER);
+                submergeController._fluidDetector?.SetDetectableFluid(water);
             }
 
             // Fix anglerfish speed on orbiting planets
diff --git a/NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs b/NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs
index 679bcc14..272c559d 100644
--- a/NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs
+++ b/NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs
@@ -76,7 +76,7 @@ namespace NewHorizons.Builder.Volumes
                     detectorGO.transform.localPosition = Vector3.zero;
                     detectorGO.layer = LayerMask.NameToLayer("BasicDetector");
                     var detector = detectorGO.AddComponent<ConstantFluidDetector>();
-                    detector.AddVolume(water);
+                    detector.SetDetectableFluid(water);
 
                     submerge._fluidDetector = detector;
                 }