diff --git a/eos/effectHandlerHelpers.py b/eos/effectHandlerHelpers.py
index a5e76b326..7f51e780c 100644
--- a/eos/effectHandlerHelpers.py
+++ b/eos/effectHandlerHelpers.py
@@ -148,20 +148,13 @@ class HandledModuleList(HandledList):
     def __replace(self, mod, position):
         if mod.isEmpty and self[position].isEmpty:
             return
-        listIndex = None
-        for i, m in enumerate(self):
-            if m.position == position:
-                listIndex = i
-                break
-        if listIndex is None:
-            return
-        old = self[listIndex]
-        del self[listIndex]
+        old = self[position]
+        del self[position]
         mod.position = position
         HandledList.insert(self, position, mod)
         if mod.isInvalid:
             self.remove(mod)
-            self.insert(listIndex, old)
+            self.insert(position, old)
 
     def replaceRackPosition(self, rackPosition, mod):
         rackPositions = []