Fix for datepicker