Fix the timing fix to be right