Fix end date