Fix end time