diff --git a/mods/d2k/maps/atreides-01a/atreides01a.lua b/mods/d2k/maps/atreides-01a/atreides01a.lua
index 4bf0a70a41..e5dd723ba8 100644
--- a/mods/d2k/maps/atreides-01a/atreides01a.lua
+++ b/mods/d2k/maps/atreides-01a/atreides01a.lua
@@ -88,9 +88,7 @@ WorldLoaded = function()
 	InitObjectives()
 
 	Trigger.OnRemovedFromWorld(AtreidesConyard, function()
-		local refs = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor)
-			return actor.Type == "refinery"
-		end)
+		local refs = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Type == "refinery" end)
 
 		if #refs == 0 then
 			harkonnen.MarkCompletedObjective(KillAtreides)
diff --git a/mods/d2k/maps/atreides-01b/atreides01b.lua b/mods/d2k/maps/atreides-01b/atreides01b.lua
index f963efc2c4..13b7497f1d 100644
--- a/mods/d2k/maps/atreides-01b/atreides01b.lua
+++ b/mods/d2k/maps/atreides-01b/atreides01b.lua
@@ -88,9 +88,7 @@ WorldLoaded = function()
 	InitObjectives()
 
 	Trigger.OnRemovedFromWorld(AtreidesConyard, function()
-		local refs = Map.ActorsInBox(Map.TopLeft, Map.BottomRight, function(actor)
-			return actor.Type == "refinery"
-		end)
+		local refs = Utils.Where(Map.ActorsInWorld, function(actor) return actor.Type == "refinery" end)
 
 		if #refs == 0 then
 			harkonnen.MarkCompletedObjective(KillAtreides)