Fixed DatePicker bug