Fixed more accurate timings