Timing bug fix