diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py
index 2b75b09b5..198b44623 100644
--- a/eos/saveddata/fit.py
+++ b/eos/saveddata/fit.py
@@ -995,6 +995,11 @@ class Fit(object):
             droneDPS += dps
             droneVolley += volley
 
+        for fighter in self.fighters:
+            dps, volley = fighter.damageStats(self.targetResists)
+            droneDPS += dps
+            droneVolley += volley
+
         self.__weaponDPS = weaponDPS
         self.__weaponVolley = weaponVolley
         self.__droneDPS = droneDPS
diff --git a/gui/builtinViewColumns/baseName.py b/gui/builtinViewColumns/baseName.py
index 7231d923e..77b4698bd 100644
--- a/gui/builtinViewColumns/baseName.py
+++ b/gui/builtinViewColumns/baseName.py
@@ -40,7 +40,7 @@ class BaseName(ViewColumn):
         if isinstance(stuff, Drone):
             return "%dx %s" % (stuff.amount, stuff.item.name)
         if isinstance(stuff, Fighter):
-            return "%d/%d %s (dps: %.2f, volley: %.2f)" % (stuff.amountActive, stuff.getModifiedItemAttr("fighterSquadronMaxSize"), stuff.item.name, stuff.damageStats()[0], stuff.damageStats()[1])
+            return "%d/%d %s" % (stuff.amountActive, stuff.getModifiedItemAttr("fighterSquadronMaxSize"), stuff.item.name)
         elif isinstance(stuff, Cargo):
             return "%dx %s" % (stuff.amount, stuff.item.name)
         elif isinstance(stuff, Fit):