Fixed datepicker issue