diff --git a/ZombieManager/scripting/ZombieManager.sp b/ZombieManager/scripting/ZombieManager.sp
index 183343d5..346a21d4 100644
--- a/ZombieManager/scripting/ZombieManager.sp
+++ b/ZombieManager/scripting/ZombieManager.sp
@@ -71,7 +71,15 @@ public void ZR_OnClientHumanPost(int client, bool respawn, bool protect)
 
 public Action ZR_OnClientInfect(int &client, int &attacker, bool &motherInfect, bool &respawnOverride, bool &respawn)
 {
-	if(g_bTestRound || (GetClientIdleTime(client) > g_iAFKTime && motherInfect) || (motherInfect && IsFakeClient(client)))
+	if(g_bTestRound)
+		return Plugin_Handled;
+
+	return Plugin_Continue;
+}
+
+public Action ZR_OnClientMotherZombieEligible(int client)
+{
+	if(GetClientIdleTime(client) > g_iAFKTime || IsFakeClient(client))
 		return Plugin_Handled;
 
 	return Plugin_Continue;