changes for datepicker issue