diff --git a/src/game/SharedDefines.h b/src/game/SharedDefines.h
index be037ace7..ee457a358 100644
--- a/src/game/SharedDefines.h
+++ b/src/game/SharedDefines.h
@@ -1001,6 +1001,9 @@ enum Mechanics
     MECHANIC_ENRAGED          = 31
 };
 
+#define FIRST_MECHANIC          1
+#define MAX_MECHANIC            32
+
 // Used for spell 42292 Immune Movement Impairment and Loss of Control (0x49967da6)
 #define IMMUNE_TO_MOVEMENT_IMPAIRMENT_AND_LOSS_CONTROL_MASK ( \
     (1<<(MECHANIC_CHARM   -1))|(1<<(MECHANIC_DISORIENTED-1))|(1<<(MECHANIC_FEAR  -1))| \
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 573642ca2..ad7ce883a 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8718,7 +8718,7 @@ int32 Unit::CalculateAuraDuration(SpellEntry const* spellProto, uint32 effectMas
     int32 mechanicMod = 0;
     uint32 mechanicMask = GetSpellMechanicMask(spellProto, effectMask);
 
-    for(int32 mechanic = MECHANIC_CHARM; mechanic <= MECHANIC_ENRAGED; ++mechanic)
+    for(int32 mechanic = FIRST_MECHANIC; mechanic < MAX_MECHANIC; ++mechanic)
     {
         if (!(mechanicMask & (1 << (mechanic-1))))
             continue;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 5326d4e8a..5b784c74f 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11331"
+ #define REVISION_NR "11332"
 #endif // __REVISION_NR_H__