diff --git a/eos b/eos
index 8bbf8c874..533606ff8 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit 8bbf8c874a1b2208754eed9e4cc80167041e2968
+Subproject commit 533606ff862507e6f53724afabf28335dec7ded3
diff --git a/gui/builtinStatsViews/targetingmiscViewFull.py b/gui/builtinStatsViews/targetingmiscViewFull.py
index e53d046b8..7e4781b37 100644
--- a/gui/builtinStatsViews/targetingmiscViewFull.py
+++ b/gui/builtinStatsViews/targetingmiscViewFull.py
@@ -106,7 +106,7 @@ class TargetingMiscViewFull(StatsView):
                  ("labelFullAlignTime", lambda: fit.alignTime, 3, 0, 0, "s"),
                  ("labelFullSigRadius", lambda: fit.ship.getModifiedItemAttr("signatureRadius"), 3, 0, 9, ""),
                  ("labelFullWarpSpeed", lambda: fit.warpSpeed, 3, 0, 0, "AU/s"),
-                 ("labelFullCargo", lambda: fit.extraAttributes["capacity"], 3, 0, 9, u"m\u00B3"))
+                 ("labelFullCargo", lambda: fit.ship.getModifiedItemAttr("capacity"), 3, 0, 9, u"m\u00B3"))
         counter = 0
         for labelName, value, prec, lowest, highest, unit in stats:
             label = getattr(self, labelName)
diff --git a/gui/itemStats.py b/gui/itemStats.py
index 3c7f8ad70..445f01d8b 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -252,7 +252,6 @@ class ItemParams (wx.Panel):
             attrsInfo = self.item.attributes if self.stuff is None else self.stuff.charge.attributes
 
         names = list(attrs.iterkeys())
-        names.extend(("mass", "capacity", "volume"))
         names.sort()
 
         idNameMap = {}
@@ -260,12 +259,10 @@ class ItemParams (wx.Panel):
         for name in names:
             info = attrsInfo.get(name)
 
-            if name in ("mass", "capacity", "volume"):
-                value = getattr(self.item, name, 0)
-            else:
-                att = attrs[name]
-                val = getattr(att, "value", None)
-                value = val if val is not None else att
+
+            att = attrs[name]
+            val = getattr(att, "value", None)
+            value = val if val is not None else att
 
             if self.toggleView != 1:
                 attrName = name