diff --git a/src/engine/wpakpowers/Behaviours.java b/src/engine/wpakpowers/Behaviours.java
index 91467664..af29ee97 100644
--- a/src/engine/wpakpowers/Behaviours.java
+++ b/src/engine/wpakpowers/Behaviours.java
@@ -31,12 +31,12 @@ public class Behaviours {
     public static Object Standard(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
                                   PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
 
-        return WpakPowerManager.applyCurveToValue(powerAction.levelCapCurve, modifierEntry.compoundCurveType.getValue(), rank);
+        return WpakPowerManager.applyCurveToValue(modifierEntry.compoundCurveType, modifierEntry.max, rank);
     }
 
     public static Object FPSubTypeAttr(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
                                        PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
-        return WpakPowerManager.applyCurveToValue(powerAction.levelCapCurve, modifierEntry.compoundCurveType.getValue(), rank);
+        return WpakPowerManager.applyCurveToValue(modifierEntry.compoundCurveType, modifierEntry.min, rank);
     }
 
     public static Object SubTypeSourceType(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
@@ -58,7 +58,7 @@ public class Behaviours {
     public static Object FPSubTypeDmg(AbstractCharacter caster, Power power, Integer rank, AbstractWorldObject target,
                                       PowerAction powerAction, Effect effect, ModifierEntry modifierEntry) {
         String key = modifierEntry.arg1;
-        float value = WpakPowerManager.applyCurveToValue(powerAction.levelCapCurve, modifierEntry.compoundCurveType.getValue(), rank);
+        float value = WpakPowerManager.applyCurveToValue(modifierEntry.compoundCurveType, modifierEntry.max, rank);
         return new Pair<>(key,value);
     }