diff --git a/Assets/GWConquest/Scripts/District.cs b/Assets/GWConquest/Scripts/District.cs
index 8b38613..8c4f3dc 100644
--- a/Assets/GWConquest/Scripts/District.cs
+++ b/Assets/GWConquest/Scripts/District.cs
@@ -66,6 +66,9 @@ namespace GWConquest
             
             Inventory = new Inventory(State, "Inventory");
             Inventory.StorageCapacity = StorageCapacity;
+            State.AddCallback("StorageCapacity", () => {
+                Inventory.StorageCapacity = StorageCapacity;
+            });
             //BoltLog.Info("Setting storage capacity to {0}", StorageCapacity);
 
             AllDistricts.Add(this);
diff --git a/Assets/GWConquest/Scripts/Unit.cs b/Assets/GWConquest/Scripts/Unit.cs
index a67ce26..4fe68f8 100644
--- a/Assets/GWConquest/Scripts/Unit.cs
+++ b/Assets/GWConquest/Scripts/Unit.cs
@@ -164,6 +164,11 @@ namespace GWConquest
                 }
             });
 
+            State.AddCallback("UnitClass", () => {
+                Inventory.StorageCapacity = Class.InventorySlots;
+                Equipment.StorageCapacity = Class.EquipmentSlots;
+            });
+
         }
 
         public static Unit SpawnUnit(Zone zone, UnitClass uc, Player player)