Timing bug fixed