Datepicker bug resolved