diff --git a/fleet1.php b/fleet1.php
index a203f54ee..8e16ea0a7 100644
--- a/fleet1.php
+++ b/fleet1.php
@@ -137,7 +137,8 @@
 
         $Fleet['array'][$ShipID] = $ShipCount;
         $Fleet['count'] += $ShipCount;
-        $ThisStorage = $_Vars_Prices[$ShipID]['capacity'] * $ShipCount;
+
+        $ThisStorage = getShipsStorageCapacity($ShipID) * $ShipCount;
 
         if ($ShipID != 210) {
             $Fleet['storage'] += $ThisStorage;
diff --git a/fleet2.php b/fleet2.php
index 1c6e61556..5b1aac8dc 100644
--- a/fleet2.php
+++ b/fleet2.php
@@ -274,7 +274,8 @@
         $ShipCount = floor($ShipCount);
         $FleetArray[$ShipID] = $ShipCount;
         $Fleet['count'] += $ShipCount;
-        $ThisStorage = $_Vars_Prices[$ShipID]['capacity'] * $ShipCount;
+
+        $ThisStorage = getShipsStorageCapacity($ShipID) * $ShipCount;
 
         if ($ShipID != 210) {
             $Fleet['storage'] += $ThisStorage;
diff --git a/fleet3.php b/fleet3.php
index 0970d952e..54015e4a2 100644
--- a/fleet3.php
+++ b/fleet3.php
@@ -450,7 +450,8 @@ function messageRed($Text, $Title)
         $ShipCount = floor($ShipCount);
         $FleetArray[$ShipID] = $ShipCount;
         $Fleet['count'] += $ShipCount;
-        $ThisStorage = $_Vars_Prices[$ShipID]['capacity'] * $ShipCount;
+
+        $ThisStorage = getShipsStorageCapacity($ShipID) * $ShipCount;
 
         if ($ShipID != 210) {
             $Fleet['storage'] += $ThisStorage;