Fixed another timing bug