diff --git a/eos b/eos
index 031309407..bb71a4d58 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit 031309407378f17f8fac4068c51128bee3fa3bec
+Subproject commit bb71a4d58951c2c94bdd65df3b8e3b188b7e0118
diff --git a/service/fleet.py b/service/fleet.py
index 6f266c8a2..311aa8246 100644
--- a/service/fleet.py
+++ b/service/fleet.py
@@ -89,7 +89,7 @@ class Fleet(object):
         squad = eos.db.getSquad(squadIDs.pop())
         squad.wing.gang.leader = booster
         if self.anyBoosters(squad):
-            squad.wing.gang.calculateModifiedAttributes()
+            squad.wing.gang.recalculateLinear()
         else:
             self.removeAssociatedFleetData(boostee)
 
@@ -103,8 +103,7 @@ class Fleet(object):
         squad = eos.db.getSquad(squadIDs.pop())
         squad.wing.leader = booster
         if self.anyBoosters(squad):
-            squad.wing.gang.calculateModifiedAttributes()
-            boostee.calculateModifiedAttributes()
+            squad.wing.gang.recalculateLinear()
         else:
             self.removeAssociatedFleetData(boostee)
 
@@ -118,7 +117,7 @@ class Fleet(object):
         squad = eos.db.getSquad(squadIDs.pop())
         squad.leader = booster
         if self.anyBoosters(squad):
-            squad.wing.gang.calculateModifiedAttributes()
+            squad.wing.gang.recalculateLinear()
         else:
             self.removeAssociatedFleetData(boostee)
 
@@ -182,4 +181,8 @@ class Fleet(object):
     def recalcFleet(self, fit):
         squadIDs = eos.db.getSquadsIDsWithFitID(fit.ID)
         if len(squadIDs) > 0:
-            eos.db.getSquad(squadIDs[0]).wing.gang.calculateModifiedAttributes()
+            eos.db.getSquad(squadIDs[0]).wing.gang.recalculateLinear()
+        else:
+            fit.clear()
+            fit.calculateModifiedAttributes()
+