diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index 46e1dd7a1..2141d103e 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -51,14 +51,14 @@ AuctionHouseMgr::~AuctionHouseMgr()
 AuctionHouseObject * AuctionHouseMgr::GetAuctionsMap(AuctionHouseEntry const* house)
 {
     if(sWorld.getConfig(CONFIG_BOOL_ALLOW_TWO_SIDE_INTERACTION_AUCTION))
-        return &mNeutralAuctions;
+        return &mAuctions[AUCTION_HOUSE_NEUTRAL];
 
     // team have linked auction houses
     switch(GetAuctionHouseTeam(house))
     {
-        case ALLIANCE: return &mAllianceAuctions;
-        case HORDE:    return &mHordeAuctions;
-        default:       return &mNeutralAuctions;
+        case ALLIANCE: return &mAuctions[AUCTION_HOUSE_ALLIANCE];
+        case HORDE:    return &mAuctions[AUCTION_HOUSE_HORDE];
+        default:       return &mAuctions[AUCTION_HOUSE_NEUTRAL];
     }
 }
 
@@ -483,9 +483,8 @@ bool AuctionHouseMgr::RemoveAItem(uint32 id)
 
 void AuctionHouseMgr::Update()
 {
-    mHordeAuctions.Update();
-    mAllianceAuctions.Update();
-    mNeutralAuctions.Update();
+    for (int i = 0; i < MAX_AUCTION_HOUSE_TYPE; ++i)
+        mAuctions[i].Update();
 }
 
 uint32 AuctionHouseMgr::GetAuctionHouseTeam(AuctionHouseEntry const* house)
diff --git a/src/game/AuctionHouseMgr.h b/src/game/AuctionHouseMgr.h
index 85eced556..2c205bb9f 100644
--- a/src/game/AuctionHouseMgr.h
+++ b/src/game/AuctionHouseMgr.h
@@ -145,6 +145,15 @@ class AuctionSorter
         Player* m_viewPlayer;
 };
 
+enum AuctionHouseType
+{
+    AUCTION_HOUSE_ALLIANCE  = 0,
+    AUCTION_HOUSE_HORDE     = 1,
+    AUCTION_HOUSE_NEUTRAL   = 2
+};
+
+#define MAX_AUCTION_HOUSE_TYPE 3
+
 class AuctionHouseMgr
 {
     public:
@@ -153,6 +162,7 @@ class AuctionHouseMgr
 
         typedef UNORDERED_MAP<uint32, Item*> ItemMap;
 
+        AuctionHouseObject* GetAuctionsMap(AuctionHouseType houseType) { return &mAuctions[houseType]; }
         AuctionHouseObject* GetAuctionsMap(AuctionHouseEntry const* house);
 
         Item* GetAItem(uint32 id)
@@ -185,9 +195,7 @@ class AuctionHouseMgr
         void Update();
 
     private:
-        AuctionHouseObject  mHordeAuctions;
-        AuctionHouseObject  mAllianceAuctions;
-        AuctionHouseObject  mNeutralAuctions;
+        AuctionHouseObject  mAuctions[MAX_AUCTION_HOUSE_TYPE];
 
         ItemMap             mAitems;
 };
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 801b43ea6..1973131cf 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 "11713"
+ #define REVISION_NR "11714"
 #endif // __REVISION_NR_H__