datapicker bug_fix