Datepicker fix