diff --git a/build.gradle b/build.gradle
index 2e869be71..030d7c8b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'idea'
 }
 
-version = "1.9.4-beta2.5"
+version = "1.9.4-beta2.6"
 group= "kamkeel.customnpc-plus"
 archivesBaseName = "CustomNPC-Plus"
 
diff --git a/src/main/java/noppes/npcs/controllers/CustomEffectController.java b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
index 0e32ba2e2..af8ce1c22 100644
--- a/src/main/java/noppes/npcs/controllers/CustomEffectController.java
+++ b/src/main/java/noppes/npcs/controllers/CustomEffectController.java
@@ -68,7 +68,8 @@ public class CustomEffectController implements ICustomEffectHandler {
         Map<EffectKey, PlayerEffect> current = getPlayerEffects(player);
         for (Map.Entry<EffectKey, PlayerEffect> entry : current.entrySet()) {
             int id = entry.getKey().getId();
-            CustomEffect effect = get(id);
+            int index = entry.getKey().getIndex();
+            CustomEffect effect = get(id, index);
             if (effect != null) {
                 effect.runEffect(player, entry.getValue());
             }
@@ -81,7 +82,8 @@ public class CustomEffectController implements ICustomEffectHandler {
         while (iterator.hasNext()) {
             Map.Entry<EffectKey, PlayerEffect> entry = iterator.next();
             int id = entry.getKey().getId();
-            CustomEffect effect = get(id);
+            int index = entry.getKey().getIndex();
+            CustomEffect effect = get(id, index);
             if (effect != null) {
                 if (effect.lossOnDeath) {
                     effect.onRemoved(player, entry.getValue(), ExpirationType.DEATH);