diff --git a/mods/cnc/maps/nod07a/nod07a.lua b/mods/cnc/maps/nod07a/nod07a.lua
index da7c2c0826..ea6aeb6672 100644
--- a/mods/cnc/maps/nod07a/nod07a.lua
+++ b/mods/cnc/maps/nod07a/nod07a.lua
@@ -105,13 +105,11 @@ SendReinforcementsWave = function(team)
 
 		transport.UnloadPassengers()
 		Trigger.OnPassengerExited(transport, function(_, passenger)
-			Utils.Do(passengers, function(actor)
-				if actor.Type == "e6" then
-					CaptureStructures(actor)
-				else
-					IdleHunt(actor)
-				end
-			end)
+			if passenger.Type == "e6" then
+				Trigger.OnIdle(passenger, CaptureStructures)
+			else
+				IdleHunt(passenger)
+			end
 
 			if not transport.HasPassengers then
 				IdleHunt(transport)
diff --git a/mods/cnc/maps/nod07b/nod07b.lua b/mods/cnc/maps/nod07b/nod07b.lua
index 537e0372f2..da7968873a 100644
--- a/mods/cnc/maps/nod07b/nod07b.lua
+++ b/mods/cnc/maps/nod07b/nod07b.lua
@@ -101,16 +101,17 @@ end
 
 SendReinforcementsWave = function(team)
 	Reinforcements.ReinforceWithTransport(GDI, "apc", team.units, { ReinforcementsGDISpawn.Location, waypoint12.Location}, nil, function(transport, passengers)
-		MoveAndHunt(transport, team.waypoints)
+		Utils.Do(team.waypoints, function(waypoint)
+			transport.Move(waypoint.Location)
+		end)
+
 		transport.UnloadPassengers()
 		Trigger.OnPassengerExited(transport, function(_, passenger)
-			Utils.Do(passengers, function(actor)
-				if actor.Type == "e6" then
-					CaptureStructures(actor)
-				else
-					IdleHunt(actor)
-				end
-			end)
+			if passenger.Type == "e6" then
+				Trigger.OnIdle(passenger, CaptureStructures)
+			else
+				IdleHunt(passenger)
+			end
 
 			if not transport.HasPassengers then
 				IdleHunt(transport)