diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index b54f91a113..bb7f98c9f7 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -432,7 +432,7 @@ void ScriptedAI::SelectUnitList(std::list<Unit*> &targetList, uint32 num, Select
         std::list<HostilReference*> m_threatlist = m_creature->getThreatManager().getThreatList();
         std::list<HostilReference*>::iterator i;
         Unit *target;
-        while(m_threatlist.size())
+        while(m_threatlist.size() && num)
         {
             if(targetType == SELECT_TARGET_BOTTOMAGGRO)
             {
@@ -455,6 +455,7 @@ void ScriptedAI::SelectUnitList(std::list<Unit*> &targetList, uint32 num, Select
                 continue;                
             }
             targetList.push_back(target);
+            --num;
         }
     }
 }
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 202682e138..494921eb2a 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2159,7 +2159,6 @@ void SpellMgr::LoadSpellCustomAttr()
 		case 37790: //Spread Shot
 		case 46771: //Flame Sear
 		case 45248: //Shadow Blades
-		case 39835: //Needle Spine
             spellInfo->MaxAffectedTargets = 3;
             break;
 		case 38310: //Multi-Shot