incorrect timings bug fix