Fix new datepick feature