diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index bc4af11c5..e64f0eb1d 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8916,10 +8916,6 @@ bool Unit::isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList,
     if(m_Visibility==VISIBILITY_RESPAWN)
         return false;
 
-    // always seen by owner
-    if(GetCharmerOrOwnerGUID()==u->GetGUID())
-        return true;
-
     // Grid dead/alive checks
     if( u->GetTypeId()==TYPEID_PLAYER)
     {
@@ -8938,6 +8934,10 @@ bool Unit::isVisibleForOrDetect(Unit const* u, bool detect, bool inVisibleList,
             return false;
     }
 
+    // always seen by owner
+    if(GetCharmerOrOwnerGUID()==u->GetGUID())
+        return true;
+
     // different visible distance checks
     if(u->isInFlight())                                     // what see player in flight
     {
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 2340b9655..293164a61 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 "7860"
+ #define REVISION_NR "7861"
 #endif // __REVISION_NR_H__