Fix end_date