Fix end date parsing