Fix for timings