#38 fixed the issue with the datepicker