diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 9c9307d504..b0add75095 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
 		// Calculate modifiers Magic Attack
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 24e95b59c4..fe7ae2fffb 100644
--- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 9c9307d504..b0add75095 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
 		// Calculate modifiers Magic Attack
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 24e95b59c4..fe7ae2fffb 100644
--- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 9c9307d504..b0add75095 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
 		// Calculate modifiers Magic Attack
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 24e95b59c4..fe7ae2fffb 100644
--- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 9c9307d504..b0add75095 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
 		// Calculate modifiers Magic Attack
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 24e95b59c4..fe7ae2fffb 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 9c9307d504..b0add75095 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
 		// Calculate modifiers Magic Attack
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 24e95b59c4..fe7ae2fffb 100644
--- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 9c9307d504..b0add75095 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
 		// Calculate modifiers Magic Attack
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 24e95b59c4..fe7ae2fffb 100644
--- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 9c9307d504..b0add75095 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -55,7 +55,7 @@ public class MAttackFinalizer implements IStatsFunction
 		// Calculate modifiers Magic Attack
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod() * chaBonus, 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index 24e95b59c4..fe7ae2fffb 100644
--- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -54,7 +54,7 @@ public class PAttackFinalizer implements IStatsFunction
 		}
 		final double chaBonus = creature.isPlayer() ? BaseStats.CHA.calcBonus(creature) : 1.;
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod() * chaBonus;
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 70add806f3..23ae95ad47 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -54,7 +54,7 @@ public class MAttackFinalizer implements IStatsFunction
 		
 		// Calculate modifiers Magic Attack
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index ef22e4010c..1866d95f52 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,7 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 70add806f3..23ae95ad47 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -54,7 +54,7 @@ public class MAttackFinalizer implements IStatsFunction
 		
 		// Calculate modifiers Magic Attack
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index ef22e4010c..1866d95f52 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,7 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 70add806f3..23ae95ad47 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -54,7 +54,7 @@ public class MAttackFinalizer implements IStatsFunction
 		
 		// Calculate modifiers Magic Attack
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index ef22e4010c..1866d95f52 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,7 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
index 70add806f3..23ae95ad47 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/MAttackFinalizer.java
@@ -54,7 +54,7 @@ public class MAttackFinalizer implements IStatsFunction
 		
 		// Calculate modifiers Magic Attack
 		baseValue *= Math.pow(BaseStats.INT.calcBonus(creature) * creature.getLevelMod(), 2.2072);
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_MATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_MATK);
 	}
 	
 	@Override
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
index ef22e4010c..1866d95f52 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/PAttackFinalizer.java
@@ -53,7 +53,7 @@ public class PAttackFinalizer implements IStatsFunction
 			baseValue *= Config.RAID_PATTACK_MULTIPLIER;
 		}
 		baseValue *= BaseStats.STR.calcBonus(creature) * creature.getLevelMod();
-		return Math.min(Stats.defaultValue(creature, stat, baseValue), Config.MAX_PATK);
+		return validateValue(creature, Stats.defaultValue(creature, stat, baseValue), 0, Config.MAX_PATK);
 	}
 	
 	@Override