Should fix part of the datepicker issue #133