fix the timing