Bug fix; walk with the datepicker