diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index a51c91236..43d993b2a 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10612,6 +10612,10 @@ void Unit::ApplyCastTimePercentMod(float val, bool apply )
 
 uint32 Unit::GetCastingTimeForBonus( SpellEntry const *spellProto, DamageEffectType damagetype, uint32 CastingTime )
 {
+    // Not apply this to creature casted spells with casttime==0
+    if(CastingTime==0 && GetTypeId()==TYPEID_UNIT && !((Creature*)this)->isPet())
+        return 3500;
+
     if (CastingTime > 7000) CastingTime = 7000;
     if (CastingTime < 1500) CastingTime = 1500;
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 53d0f4b8d..cfb991ff2 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 "6878"
+ #define REVISION_NR "6879"
 #endif // __REVISION_NR_H__