Timing and bug fix