diff --git a/carculator_truck/__init__.py b/carculator_truck/__init__.py
index e3d31a8..8974ff1 100644
--- a/carculator_truck/__init__.py
+++ b/carculator_truck/__init__.py
@@ -18,7 +18,7 @@
 )
 
 # library version
-__version__ = (0, 3, 9)
+__version__ = (0, 4, 0)
 
 from pathlib import Path
 
diff --git a/carculator_truck/model.py b/carculator_truck/model.py
index 18cbfdb..6f84632 100644
--- a/carculator_truck/model.py
+++ b/carculator_truck/model.py
@@ -107,6 +107,12 @@ def set_all(self, electric_utility_factor: float = None):
                 "available payload"
             ].sum()
 
+        self["cargo mass"] = np.clip(self["cargo mass"], 0, self["available payload"])
+
+        self["capacity utilization"] = np.clip(
+            (self["cargo mass"] / self["available payload"]), 0, 1
+        )
+
         self.adjust_cost()
 
         self.set_electric_utility_factor(electric_utility_factor)
@@ -520,12 +526,6 @@ def set_vehicle_masses(self):
             - (self["average passengers"] * self["average passenger mass"])
         )
 
-        self["cargo mass"] = np.clip(self["cargo mass"], 0, self["available payload"])
-
-        self["capacity utilization"] = np.clip(
-            (self["cargo mass"] / self["available payload"]), 0, 1
-        )
-
     def set_component_masses(self):
         self["combustion engine mass"] = (
             self["combustion power"] * self["engine mass per power"]
diff --git a/setup.py b/setup.py
index caf78af..acd880a 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ def package_files(directory):
 
 setup(
     name="carculator_truck",
-    version="0.3.9",
+    version="0.4.0",
     packages=packages,
     author="Romain Sacchi <romain.sacchi@psi.ch>",
     license=open("LICENSE").read(),