Fix the timing issue