Fix for datepicker and issue #80