diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index f41f3279a..1fe54b043 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -206,9 +206,9 @@ bool Creature::InitEntry(uint32 Entry, uint32 team, const CreatureData *data )
 
     // difficulties for dungeons/battleground ordered in normal way
     // and if more high version not exist must be used lesser version
-    // for raid order different:
-    // 10 man normal version must be used instead not existed 10 man heroic version
-    // 25 man normal version must be used instead not existed 24 man heroic version
+    // for raid order different:
+    // 10 man normal version must be used instead not existed 10 man heroic version
+    // 25 man normal version must be used instead not existed 24 man heroic version
     CreatureInfo const *cinfo = normalInfo;
     for (uint8 diff = uint8(GetMap()->GetDifficulty()); diff > 0;)
     {
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 607709d5e..42f7375f7 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -5710,6 +5710,11 @@ Pet* Unit::GetPet() const
     return NULL;
 }
 
+Pet* Unit::_GetPet(ObjectGuid guid) const
+{
+    return GetMap()->GetPet(guid);
+}
+
 Unit* Unit::GetCharm() const
 {
     if (uint64 charm_guid = GetCharmGUID())
diff --git a/src/game/Unit.h b/src/game/Unit.h
index 53bfd319a..4fda849f3 100644
--- a/src/game/Unit.h
+++ b/src/game/Unit.h
@@ -1945,6 +1945,7 @@ class MANGOS_DLL_SPEC Unit : public WorldObject
         uint32 GetCombatRatingDamageReduction(CombatRating cr, float rate, float cap, uint32 damage) const;
 
         Unit* _GetTotem(TotemSlot slot) const;              // for templated function without include need
+        Pet* _GetPet(ObjectGuid guid) const;                // for templated function without include need
 
         uint32 m_state;                                     // Even derived shouldn't modify
         uint32 m_CombatTimer;
@@ -1978,7 +1979,7 @@ void Unit::CallForAllControlledUnits(Func const& func, bool withTotems, bool wit
     if (withGuardians)
     {
         for(GuardianPetList::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end(); ++itr)
-            if (Pet* guardian = GetMap()->GetPet(*itr))
+            if (Pet* guardian = _GetPet(*itr))
                 func(guardian);
     }
 
@@ -2005,7 +2006,7 @@ bool Unit::CheckAllControlledUnits(Func const& func, bool withTotems, bool withG
     if (withGuardians)
     {
         for(GuardianPetList::const_iterator itr = m_guardianPets.begin(); itr != m_guardianPets.end(); ++itr)
-            if (Pet const* guardian = GetMap()->GetPet(*itr))
+            if (Pet const* guardian = _GetPet(*itr))
                 if (func(guardian))
                     return true;
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 9a5d71da5..d57aecb61 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 "10390"
+ #define REVISION_NR "10391"
 #endif // __REVISION_NR_H__