Infection-proofing

Glitch-spotting thanks to Voker57.