fix datapicker issue