fix date picker bug
merge