Date picker, fix #1