diff --git a/eos/effects/systemarmorrepairamount.py b/eos/effects/systemarmorrepairamount.py
index a914b2866..d94d4db0c 100755
--- a/eos/effects/systemarmorrepairamount.py
+++ b/eos/effects/systemarmorrepairamount.py
@@ -5,4 +5,4 @@ type = ("projected", "offline")
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Armor Repair Unit",
                                      "armorDamageAmount", module.getModifiedItemAttr("armorDamageAmountMultiplier"),
-                                     stackingPenalties = True)
+                                     stackingPenalties = True, penaltyGroup="postMul")
diff --git a/eos/effects/systemshieldrepairamountshieldskills.py b/eos/effects/systemshieldrepairamountshieldskills.py
new file mode 100644
index 000000000..660848254
--- /dev/null
+++ b/eos/effects/systemshieldrepairamountshieldskills.py
@@ -0,0 +1,8 @@
+# Used by:
+# Celestials named like: Cataclysmic Variable Beacon Class (6 of 6)
+runTime = "early"
+type = ("projected", "offline")
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),
+                                     "shieldBonus", module.getModifiedItemAttr("shieldBonusMultiplier"),
+                                     stackingPenalties = True, penaltyGroup="postMul")