diff --git a/eos/saveddata/module.py b/eos/saveddata/module.py
index c09d23564..3834def33 100644
--- a/eos/saveddata/module.py
+++ b/eos/saveddata/module.py
@@ -439,7 +439,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
 
         # EVE doesn't let capital modules be fit onto subcapital hulls. Confirmed by CCP Larrikin that this is dictated
         # by the modules volume. See GH issue #1096
-        if (fit.ship.getModifiedItemAttr("isCapitalSize", 0) != 1 and self.isCapitalSize):
+        if not isinstance(fit.ship, Citadel) and fit.ship.getModifiedItemAttr("isCapitalSize", 0) != 1 and self.isCapitalSize:
             return False
 
         # If the mod is a subsystem, don't let two subs in the same slot fit
diff --git a/eve.db b/eve.db
index 4b5bd1001..a3a1f1d59 100644
Binary files a/eve.db and b/eve.db differ
diff --git a/gui/itemStats.py b/gui/itemStats.py
index 3a59f55b6..2c9ce4a5d 100644
--- a/gui/itemStats.py
+++ b/gui/itemStats.py
@@ -1438,21 +1438,21 @@ class ItemProperties(wx.Panel):
                 else:
                     attrName = name.title()
                     value = getattr(self.item, name)
+
+                index = self.paramList.InsertStringItem(sys.maxint, attrName)
+                # index = self.paramList.InsertImageStringItem(sys.maxint, attrName)
+                idNameMap[idCount] = attrName
+                self.paramList.SetItemData(index, idCount)
+                idCount += 1
+
+                valueUnit = str(value)
+
+                self.paramList.SetStringItem(index, 1, valueUnit)
             except:
                 # TODO: Add logging to this.
                 # We couldn't get a property for some reason. Skip it for now.
                 continue
 
-            index = self.paramList.InsertStringItem(sys.maxint, attrName)
-            # index = self.paramList.InsertImageStringItem(sys.maxint, attrName)
-            idNameMap[idCount] = attrName
-            self.paramList.SetItemData(index, idCount)
-            idCount += 1
-
-            valueUnit = str(value)
-
-            self.paramList.SetStringItem(index, 1, valueUnit)
-
         self.paramList.SortItems(lambda id1, id2: cmp(idNameMap[id1], idNameMap[id2]))
         self.paramList.RefreshRows()
         self.totalAttrsLabel.SetLabel("%d attributes. " % idCount)
diff --git a/imgs/renders/42241.png b/imgs/renders/42241.png
new file mode 100644
index 000000000..14dc0ee57
Binary files /dev/null and b/imgs/renders/42241.png differ
diff --git a/imgs/renders/42242.png b/imgs/renders/42242.png
new file mode 100644
index 000000000..3610d4afe
Binary files /dev/null and b/imgs/renders/42242.png differ
diff --git a/imgs/renders/42243.png b/imgs/renders/42243.png
new file mode 100644
index 000000000..14e131173
Binary files /dev/null and b/imgs/renders/42243.png differ
diff --git a/imgs/renders/44993.png b/imgs/renders/44993.png
new file mode 100644
index 000000000..d1c2b0b74
Binary files /dev/null and b/imgs/renders/44993.png differ
diff --git a/imgs/renders/44995.png b/imgs/renders/44995.png
new file mode 100644
index 000000000..c75e4ca35
Binary files /dev/null and b/imgs/renders/44995.png differ