Fix DatePicker