diff --git a/eos b/eos
index 1727e195d..25d620a29 160000
--- a/eos
+++ b/eos
@@ -1 +1 @@
-Subproject commit 1727e195d69a9f0dc9563a9f1128f2d66c712a7c
+Subproject commit 25d620a29c9e7bf9cfbf3c1eda25e82d5e5cd174
diff --git a/gui/builtinContextMenus/moduleAmmoPicker.py b/gui/builtinContextMenus/moduleAmmoPicker.py
index bcdd0a43a..c212dea2b 100644
--- a/gui/builtinContextMenus/moduleAmmoPicker.py
+++ b/gui/builtinContextMenus/moduleAmmoPicker.py
@@ -182,7 +182,7 @@ class ModuleAmmoPicker(ContextMenu):
                     item.SetSubMenu(sub)
                     m.AppendItem(item)
 
-                if charge.name != "Defender I":
+                if charge.name not in ("Light Defender Missile I", "Heavy Defender Missile I"):
                     sub.AppendItem(self.addCharge(sub, charge))
                 else:
                     defender = charge
diff --git a/staticdata b/staticdata
index 8a705a0ae..521ae56d5 160000
--- a/staticdata
+++ b/staticdata
@@ -1 +1 @@
-Subproject commit 8a705a0aea1104cb393759644e0dbc7d3f16d29c
+Subproject commit 521ae56d574f167abe3d9ff95874436e7cd2f5d3