diff --git a/ChangeLog.md b/ChangeLog.md
index d2acfd06..f6f28418 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,8 @@
 #2.2.13
   * Add 'time to drain' summary value.  This is the time to drain the WEP capacitor if firing all enabled weapons
   * Do not include utility slot DPS/EPS/HPS in summary information
+  * Ensure that auto loader special shows in the tooltip
+  * Ensure that ship mass is recalculated when appropriate
 
 #2.2.12
   * Tidy up old references to coriolis.io
diff --git a/src/app/shipyard/Ship.js b/src/app/shipyard/Ship.js
index 667f5d34..ad8ba19c 100755
--- a/src/app/shipyard/Ship.js
+++ b/src/app/shipyard/Ship.js
@@ -419,6 +419,7 @@ export default class Ship {
     m.mods = {};
     this.updatePowerGenerated()
         .updatePowerUsed()
+        .recalculateMass()
         .updateJumpStats()
         .recalculateShield()
         .recalculateShieldCells()
@@ -462,11 +463,9 @@ export default class Ship {
       this.updatePowerUsed();
     } else if (name === 'mass') {
       // Mass
-      let oldMass = m.getMass();
+      //let oldMass = m.getMass();
       m.setModValue(name, value, sentfromui);
-      let newMass = m.getMass();
-      this.unladenMass = this.unladenMass - oldMass + newMass;
-      this.ladenMass = this.ladenMass - oldMass + newMass;
+      this.recalculateMass();
       this.updateMovement();
       this.updateJumpStats();
     } else if (name === 'maxfuel') {
@@ -632,6 +631,7 @@ export default class Ship {
     if (comps) {
       this.updatePowerGenerated()
           .updatePowerUsed()
+          .recalculateMass()
           .updateJumpStats()
           .recalculateShield()
           .recalculateShieldCells()
@@ -871,15 +871,6 @@ export default class Ship {
     let shieldCellsChange = (n && n.grp === 'scb') || (old && old.grp === 'scb');
 
     if (old) {  // Old modul now being removed
-      switch (old.grp) {
-        case 'ft':
-          this.fuelCapacity -= old.fuel;
-          break;
-        case 'cr':
-          this.cargoCapacity -= old.cargo;
-          break;
-      }
-
       if (slot.incCost && old.cost) {
         this.totalCost -= old.cost * this.moduleCostMultiplier;
       }
@@ -887,20 +878,9 @@ export default class Ship {
       if (old.getPowerUsage() > 0 && slot.enabled) {
         powerUsedChange = true;
       }
-
-      this.unladenMass -= old.getMass() || 0;
     }
 
     if (n) {
-      switch (n.grp) {
-        case 'ft':
-          this.fuelCapacity += n.fuel;
-          break;
-        case 'cr':
-          this.cargoCapacity += n.cargo;
-          break;
-      }
-
       if (slot.incCost && n.cost) {
         this.totalCost += n.cost * this.moduleCostMultiplier;
       }
@@ -908,12 +888,9 @@ export default class Ship {
       if (n.power && slot.enabled) {
         powerUsedChange = true;
       }
-
-      this.unladenMass += n.getMass() || 0;
     }
 
-    this.ladenMass = this.unladenMass + this.cargoCapacity + this.fuelCapacity;
-
+    this.recalculateMass();
     if (!preventUpdate) {
       if (dpsChanged) {
         this.recalculateDps();
@@ -1168,6 +1145,53 @@ export default class Ship {
     return this;
   }
 
+  /**
+   * Eecalculate mass
+   * @return {this} The ship instance (for chaining operations)
+   */
+  recalculateMass() {
+    let unladenMass = this.hullMass;
+    let cargoCapacity = 0;
+    let fuelCapacity = 0;
+
+    for (let slotNum in this.standard) {
+      const slot = this.standard[slotNum];
+      if (slot.m) {
+        unladenMass += slot.m.getMass();
+        if (slot.m.grp === 'ft') {
+          fuelCapacity += slot.m.fuel;
+	}
+      }
+    }
+
+    for (let slotNum in this.internal) {
+      const slot = this.internal[slotNum];
+      if (slot.m) {
+        unladenMass += slot.m.getMass();
+        if (slot.m.grp === 'ft') {
+          fuelCapacity += slot.m.fuel;
+	} else if (slot.m.grp === 'cr') {
+          cargoCapacity += slot.m.cargo;
+	}
+      }
+    }
+
+    for (let slotNum in this.hardpoints) {
+      const slot = this.hardpoints[slotNum];
+      if (slot.m) {
+        unladenMass += slot.m.getMass();
+      }
+    }
+
+    // Update global stats
+    this.unladenMass = unladenMass;
+    this.cargoCapacity = cargoCapacity;
+    this.fuelCapacity = fuelCapacity;
+    this.ladenMass = unladenMass + fuelCapacity + cargoCapacity;
+
+    return this;
+  }
+
   /**
    * Update movement values
    * @return {this} The ship instance (for chaining operations)