diff --git a/FakePopulation/scripting/FakePopulation.sp b/FakePopulation/scripting/FakePopulation.sp
index 4dbc3816..3e773e8f 100644
--- a/FakePopulation/scripting/FakePopulation.sp
+++ b/FakePopulation/scripting/FakePopulation.sp
@@ -279,7 +279,7 @@ public void CheckPopulation()
 		{
 			for(int i = 1; i <= MaxClients; i++)
 			{
-				if(g_bFakePopulation[i] && GetClientTeam(i) < 1)
+				if(g_bFakePopulation[i] && GetClientTeam(i) <= CS_TEAM_SPECTATOR)
 				{
 					ChangeClientTeam(i, CS_TEAM_CT);
 					FakeClientCommandEx(i, "joinclass");
@@ -293,7 +293,7 @@ public void CheckPopulation()
 		{
 			for(int i = 1; i <= MaxClients; i++)
 			{
-				if(g_bFakePopulation[i] && GetClientTeam(i) > 0)
+				if(g_bFakePopulation[i] && GetClientTeam(i) >= CS_TEAM_T)
 				{
 					ChangeClientTeam(i, CS_TEAM_SPECTATOR);
 					iFakesInTeam--;