diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
index 24225cd61..c9ae60414 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/scoreboard/GameScoreboard.java
@@ -1,12 +1,10 @@
 package nautilus.game.arcade.scoreboard;
 
 import java.util.ArrayList;
-
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.UtilMath;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.GameTeam;
-
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -122,14 +120,20 @@ public class GameScoreboard
 		for (GameTeam team : Game.GetTeamList())
 		{
 			System.out.println("Scoreboard Team: " + team.GetName().toUpperCase());
-			if(team.GetDisplaytag())
+			if (team.GetDisplaytag())
 			{
-				_scoreboard.registerNewTeam(ParseTeamName(team.GetName().toUpperCase())).setPrefix(team.GetColor() + C.Bold + team.GetName() + team.GetColor() + " ");
+				Team group = _scoreboard.registerNewTeam(ParseTeamName(team.GetName().toUpperCase()));
+
+				group.setPrefix(team.GetColor() + C.Bold + team.GetName() + team.GetColor() + " ");
+				group.setSuffix(C.Reset);
 			}
 			else
 			{
-				_scoreboard.registerNewTeam(ParseTeamName(team.GetName().toUpperCase())).setPrefix(team.GetColor() + "");
-			}	
+				Team group = _scoreboard.registerNewTeam(ParseTeamName(team.GetName().toUpperCase()));
+
+				group.setPrefix(team.GetColor() + "");
+				group.setSuffix(C.Reset);
+			}
 		}
 		
 		/*