diff --git a/server/gameserver/mtb/SafeArea.h b/server/gameserver/mtb/SafeArea.h
index 60ac7ae3..25bacb56 100644
--- a/server/gameserver/mtb/SafeArea.h
+++ b/server/gameserver/mtb/SafeArea.h
@@ -46,7 +46,7 @@ namespace mtb
     std::string boss_;
 
 public:
-    std::bitset<9> __flags__;
+    std::bitset<10> __flags__;
   };
 
 };
diff --git a/server/gameserver/sandtable.cc b/server/gameserver/sandtable.cc
index a36d15a5..481f3535 100644
--- a/server/gameserver/sandtable.cc
+++ b/server/gameserver/sandtable.cc
@@ -20,8 +20,10 @@ SandTable::SandTable(Room* room): room_(room)
          {
              if (a8::TIMER_EXEC_EVENT == event) {
                  room->LockRoom();
+                 #if 0
                  room->CombineTeam();
                  room->FillTeam();
+                 #endif
              }
          },
          &room->xtimer_attacher_);