Fixed datepicker problem