diff --git a/src/game/ObjectGuid.h b/src/game/ObjectGuid.h
index 3562756bd..ea9b0ac2c 100644
--- a/src/game/ObjectGuid.h
+++ b/src/game/ObjectGuid.h
@@ -112,7 +112,7 @@ class MANGOS_DLL_SPEC ObjectGuid
     public:                                                 // accessors
         uint64   GetRawValue() const { return m_guid; }
         HighGuid GetHigh() const { return HighGuid((m_guid >> 52) & 0x00000FFF); }
-        uint32   GetEntry() const { return HasEntry() ? uint32((m_guid >> 32) & UI64LIT(0x0000000000FFFFFF)) : 0; }
+        uint32   GetEntry() const { return HasEntry() ? uint32((m_guid >> 32) & UI64LIT(0xFFFF)) : 0; }
         uint32   GetCounter()  const
         {
             return HasEntry()
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index ce14e4b2c..614822516 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 "12176"
+ #define REVISION_NR "12177"
 #endif // __REVISION_NR_H__