#15 fix date picker