diff --git a/Moose/Cargo.lua b/Moose/Cargo.lua
index e7df8526f..80acd296f 100644
--- a/Moose/Cargo.lua
+++ b/Moose/Cargo.lua
@@ -634,11 +634,13 @@ function CARGO_GROUP:UnLoad( Client, TargetZoneName )
 self:T()
 
 	self:T( 'self.CargoName = ' .. self.CargoName ) 
+
+	local CargoGroup = self.CargoSpawn:SpawnFromUnit( Client:GetClientGroupUnit(), 60, 30 )
+
+	self.CargoGroupName = CargoGroup:GetName()
 	self:T( 'self.CargoGroupName = ' .. self.CargoGroupName ) 
 	
-	--self.CargoSpawn:FromCarrier( Client:GetClientGroupDCSUnit(), TargetZoneName, self.CargoGroupName )
-
-	self.CargoSpawn:SpawnFromUnit( Client:GetClientGroupUnit(), self.CargoGroupName ):RouteToZone( ZONE:New( TargetZoneName ), true )
+	CargoGroup:RouteToZone( ZONE:New( TargetZoneName ), true )
 	
 	self:StatusUnLoaded()
 
diff --git a/Moose/Moose_Embedded.lua b/Moose/Moose_Embedded.lua
index e053388f4..68c47fc18 100644
--- a/Moose/Moose_Embedded.lua
+++ b/Moose/Moose_Embedded.lua
@@ -5213,11 +5213,13 @@ function CARGO_GROUP:UnLoad( Client, TargetZoneName )
 self:T()
 
 	self:T( 'self.CargoName = ' .. self.CargoName ) 
+
+	local CargoGroup = self.CargoSpawn:SpawnFromUnit( Client:GetClientGroupUnit(), 60, 30 )
+
+	self.CargoGroupName = CargoGroup:GetName()
 	self:T( 'self.CargoGroupName = ' .. self.CargoGroupName ) 
 	
-	--self.CargoSpawn:FromCarrier( Client:GetClientGroupDCSUnit(), TargetZoneName, self.CargoGroupName )
-
-	self.CargoSpawn:SpawnFromUnit( Client:GetClientGroupUnit(), self.CargoGroupName ):RouteToZone( ZONE:New( TargetZoneName ), true )
+	CargoGroup:RouteToZone( ZONE:New( TargetZoneName ), true )
 	
 	self:StatusUnLoaded()