Fixed delay bug