date picker fix #30