Index: trunk/src/game/WaypointMovementGenerator.cpp
===================================================================
--- trunk/src/game/WaypointMovementGenerator.cpp (revision 44)
+++ trunk/src/game/WaypointMovementGenerator.cpp (revision 98)
@@ -166,8 +166,7 @@
                         creature.Say(behavior->text[0].c_str(), 0, 0);
                 }
-
-                i_hasDone[idx] = true;
-                MovementInform(creature);
             }                                               // wpBehaviour found
+            i_hasDone[idx] = true;
+            MovementInform(creature);
         }                                                   // HasDone == false
     }                                                       // i_creature.IsStopped()
Index: trunk/src/game/SpellMgr.cpp
===================================================================
--- trunk/src/game/SpellMgr.cpp (revision 87)
+++ trunk/src/game/SpellMgr.cpp (revision 98)
@@ -1041,4 +1041,7 @@
         if(spellInfo_1->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags)
             return true;
+        if(spellInfo_1->SpellFamilyName == SPELLFAMILY_SHAMAN)
+            if(IsElementalShield(spellInfo_1) && IsElementalShield(spellInfo_2))
+                return true;
         //Corruption & Seed of corruption
         if(spellInfo_1->SpellFamilyName == SPELLFAMILY_WARLOCK)