diff --git a/server/masterserver/gsmgr.cc b/server/masterserver/gsmgr.cc
index 2df110d..8cd2272 100644
--- a/server/masterserver/gsmgr.cc
+++ b/server/masterserver/gsmgr.cc
@@ -167,10 +167,19 @@ void GSMgr::RearrangeNode()
               [] (const GSNode* a, const GSNode* b)
               {
                   if (a->servicing && b->servicing) {
-                      return
-                          a->online_num < b->online_num ||
-                          a->room_num < b->room_num ||
-                          a->node_idx > b->node_idx;
+                      if (a->room_num < b->room_num) {
+                          return true;
+                      }
+                      if (a->room_num > b->room_num) {
+                          return false;
+                      }
+                      if (a->online_num < b->online_num) {
+                          return true;
+                      }
+                      if (a->online_num > b->online_num) {
+                          return false;
+                      }
+                      return a->node_idx > b->node_idx;
                   }
                   if (a->servicing) {
                       return true;