Datepicker issue fixed