Readded delay prevention

Lag was killer...