diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 35f48cf95..99676426c 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -4709,8 +4709,9 @@ bool Spell::CanAutoCast(Unit* target)
             }
             else
             {
-                if( target->GetAuras().count(Unit::spellEffectPair(m_spellInfo->Id, j)) >= m_spellInfo->StackAmount)
-                    return false;
+                if(Aura* aura = target->GetAura(m_spellInfo->Id, j))
+                    if(aura->GetStackAmount() >= m_spellInfo->StackAmount)
+                        return false;
             }
         }
         else if ( IsAreaAuraEffect( m_spellInfo->Effect[j] ))
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index ca65be9c1..1a71db475 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 "8019"
+ #define REVISION_NR "8020"
 #endif // __REVISION_NR_H__