diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 3ed60018ecc..02da82cb5fb 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -6851,11 +6851,7 @@ bool ObjectMgr::LoadTrinityStrings(DatabaseType& db, char const* table, int32 mi
     for(TrinityStringLocaleMap::iterator itr = mTrinityStringLocaleMap.begin(); itr != mTrinityStringLocaleMap.end();)
     {
         if (itr->first >= start_value && itr->first < end_value)
-        {
-            TrinityStringLocaleMap::iterator itr2 = itr;
-            ++itr;
-            mTrinityStringLocaleMap.erase(itr2);
-        }
+            mTrinityStringLocaleMap.erase(itr++);
         else
             ++itr;
     }
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 33915398c91..136429a41d5 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -154,7 +154,7 @@ typedef UNORDERED_MAP<uint32,ItemLocale> ItemLocaleMap;
 typedef UNORDERED_MAP<uint32,QuestLocale> QuestLocaleMap;
 typedef UNORDERED_MAP<uint32,NpcTextLocale> NpcTextLocaleMap;
 typedef UNORDERED_MAP<uint32,PageTextLocale> PageTextLocaleMap;
-typedef UNORDERED_MAP<uint32,TrinityStringLocale> TrinityStringLocaleMap;
+typedef UNORDERED_MAP<int32,TrinityStringLocale> TrinityStringLocaleMap;
 typedef UNORDERED_MAP<uint32,NpcOptionLocale> NpcOptionLocaleMap;
 typedef UNORDERED_MAP<uint32,PointOfInterestLocale> PointOfInterestLocaleMap;