Datepicker bug fixed