diff --git a/Moose Development/Moose/Wrapper/DynamicCargo.lua b/Moose Development/Moose/Wrapper/DynamicCargo.lua
index 3ff7ddc53..7a091fc6e 100644
--- a/Moose Development/Moose/Wrapper/DynamicCargo.lua	
+++ b/Moose Development/Moose/Wrapper/DynamicCargo.lua	
@@ -183,7 +183,7 @@ end
 -- @param #DYNAMICCARGO self
 -- @return DCS static object
 function DYNAMICCARGO:GetDCSObject()
-  local DCSStatic = Unit.getByName( self.StaticName ) 
+  local DCSStatic = StaticObject.getByName( self.StaticName ) or Unit.getByName( self.StaticName ) 
   if DCSStatic then
     return DCSStatic
   end
diff --git a/Moose Development/Moose/Wrapper/Storage.lua b/Moose Development/Moose/Wrapper/Storage.lua
index 15cbf995d..4ad6bf6fa 100644
--- a/Moose Development/Moose/Wrapper/Storage.lua	
+++ b/Moose Development/Moose/Wrapper/Storage.lua	
@@ -226,7 +226,7 @@ function STORAGE:NewFromStaticCargo(StaticCargoName)
   return self
 end
 
---- Create a new STORAGE object from an DCS static cargo object.
+--- Create a new STORAGE object from a Wrapper.DynamicCargo#DYNAMICCARGO object.
 -- @param #STORAGE self
 -- @param #string DynamicCargoName Unit name of the dynamic cargo.
 -- @return #STORAGE self
@@ -235,7 +235,7 @@ function STORAGE:NewFromDynamicCargo(DynamicCargoName)
   -- Inherit everything from BASE class.
   local self=BASE:Inherit(self, BASE:New()) -- #STORAGE
 
-  self.airbase=Unit.getByName(DynamicCargoName)
+  self.airbase=Unit.getByName(DynamicCargoName) or StaticObject.getByName(DynamicCargoName)
 
   if Airbase.getWarehouse then
     self.warehouse=Warehouse.getCargoAsWarehouse(self.airbase)