fixing datepicker with Elton suggestion