diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp
index 0e3e3a5b0..d02409c8c 100644
--- a/src/game/ArenaTeam.cpp
+++ b/src/game/ArenaTeam.cpp
@@ -540,15 +540,6 @@ bool ArenaTeam::HaveMember(ObjectGuid guid) const
     return false;
 }
 
-uint32 ArenaTeam::GetAvgPersonalRating() const
-{
-    uint32 rating = 0;
-    for(MemberList::const_iterator itr = m_members.begin(); itr !=  m_members.end(); ++itr)
-        rating += itr->personal_rating;
-
-    return rating / m_Type;
-}
-
 uint32 ArenaTeam::GetPoints(uint32 MemberRating)
 {
     // returns how many points would be awarded with this team type with this rating
diff --git a/src/game/ArenaTeam.h b/src/game/ArenaTeam.h
index 7fcbfc8ca..7a26ac504 100644
--- a/src/game/ArenaTeam.h
+++ b/src/game/ArenaTeam.h
@@ -197,7 +197,6 @@ class ArenaTeam
         void Stats(WorldSession *session);
         void InspectStats(WorldSession *session, ObjectGuid guid);
 
-        uint32 GetAvgPersonalRating() const;
         uint32 GetPoints(uint32 MemberRating);
         float GetChanceAgainst(uint32 own_rating, uint32 enemy_rating);
         int32 WonAgainst(uint32 againstRating);
diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index 93dd3d8c1..1e45a77ad 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -699,7 +699,17 @@ void WorldSession::HandleBattlemasterJoinArena( WorldPacket & recv_data )
         arenaRating = at->GetRating();
         // the arena team id must match for everyone in the group
         // get the personal ratings for queue
-        uint32 avg_pers_rating = at->GetAvgPersonalRating();
+        uint32 avg_pers_rating = 0;
+        for(GroupReference *itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
+        {
+            Player *member = itr->getSource();
+
+            // calc avg personal rating
+            avg_pers_rating += member->GetArenaPersonalRating(arenaslot);
+        }
+
+        if (arenatype)
+            avg_pers_rating /= arenatype;
 
         // if avg personal rating is more than 150 points below the teams rating, the team will be queued against an opponent matching or similar to the average personal rating
         if (avg_pers_rating + 150 < arenaRating)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 796c9455a..caa1e3376 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 "11349"
+ #define REVISION_NR "11350"
 #endif // __REVISION_NR_H__