Fix start date always earlier then end date