Fixed another timing related bug