diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index c936d9771..1e9afeac6 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1823,7 +1823,15 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
 
                         if ((*iter)->GetEntry() == i_spellST->second.targetEntry)
                         {
-                            targetUnitMap.push_back((*iter));
+                            if (i_spellST->second.type == SPELL_TARGET_TYPE_DEAD && ((Creature*)(*iter))->IsCorpse())
+                            {
+                                targetUnitMap.push_back((*iter));
+                            }
+                            else if (i_spellST->second.type == SPELL_TARGET_TYPE_CREATURE && (*iter)->isAlive())
+                            {
+                                targetUnitMap.push_back((*iter));
+                            }
+
                             break;
                         }
                     }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 7966a8fca..f9488c1b8 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 "10723"
+ #define REVISION_NR "10724"
 #endif // __REVISION_NR_H__