diff --git a/gamemodes/zombiesurvival/entities/entities/func_noair/init.lua b/gamemodes/zombiesurvival/entities/entities/func_noair.lua
similarity index 92%
rename from gamemodes/zombiesurvival/entities/entities/func_noair/init.lua
rename to gamemodes/zombiesurvival/entities/entities/func_noair.lua
index cc8eb02..65385e6 100644
--- a/gamemodes/zombiesurvival/entities/entities/func_noair/init.lua
+++ b/gamemodes/zombiesurvival/entities/entities/func_noair.lua
@@ -43,14 +43,14 @@ function ENT:Leave(ent)
 end
 
 function ENT:Touch(ent)
-	if ent:IsPlayer() and ent.NoAirBrush == self and not self.On then
+	if not self.On and ent:IsPlayer() and ent.NoAirBrush == self then
 		self:Leave(ent)
 	end
 end
 
 function ENT:StartTouch(ent)
 	if self.On and ent:IsPlayer() and ent:Alive() and ent:Team() == TEAM_HUMAN and not ent.NoAirBrush then
-		ent.NoAirBrush = self
+		self:Enter(ent)
 	end
 end