diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 183e1ad..3130da2 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -54,6 +54,7 @@ Human::~Human()
 void Human::Initialize()
 {
     Entity::Initialize();
+    skill_xtimer_attacher_.xtimer = &room->xtimer;
     RecalcSelfCollider();
     volume_ = meta->volume;
     observers_.insert(this);
@@ -1783,7 +1784,7 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
     } else {
         params->SetVal("alive_time", dead_frameno * 1000.0f / SERVER_FRAME_RATE);
     }
-    params->SetVal("team_status", team_id != 0);
+    params->SetVal("team_status", team_members && team_members->size() > 1 ? 1 : 0);
     params->SetVal("room_uuid", room->room_uuid);
 
     int snipe_kill = 0;