diff --git a/src/me/yaruma/fightsystem/fight/FightTeam.java b/src/me/yaruma/fightsystem/fight/FightTeam.java
index 8227faf..f7fbec2 100644
--- a/src/me/yaruma/fightsystem/fight/FightTeam.java
+++ b/src/me/yaruma/fightsystem/fight/FightTeam.java
@@ -56,15 +56,15 @@ public class FightTeam {
     }
 
     public boolean isPlayerInTeam(Player player) {
+        for(FightPlayer fightPlayer : this.players) {
+            if(!fightPlayer.getPlayer().equals(player)) continue;
+            return true;
+        }
         if(this.leader.getPlayer() == null) return false;
 
         if(this.leader.getPlayer().equals(player)) {
             return true;
         }
-        for(FightPlayer fightPlayer : this.players) {
-            if(!fightPlayer.getPlayer().equals(player)) continue;
-            return true;
-        }
         return false;
     }
 
diff --git a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
index 9ee3e0b..9aa28df 100644
--- a/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
+++ b/src/me/yaruma/fightsystem/listener/PlayerJoinListener.java
@@ -33,11 +33,14 @@ public class PlayerJoinListener implements Listener {
             if(!Fight.getRedTeam().hasTeamLeader()) {
                 Fight.getRedTeam().setLeader(new FightPlayer(player, false));
                 player.setGameMode(GameMode.ADVENTURE);
+                Bukkit.broadcastMessage("ADVENTURE 36");
             } else if(!Fight.getBlueTeam().hasTeamLeader()) {
                 Fight.getBlueTeam().setLeader(new FightPlayer(player, false));
                 player.setGameMode(GameMode.ADVENTURE);
+                Bukkit.broadcastMessage("ADVENTURE 39");
             } else {
                 player.setGameMode(GameMode.SPECTATOR);
+                Bukkit.broadcastMessage("SPECTATOR 42");
                 player.teleport(instance.getSpecSpawnLoc());
             }
         }