Fixed Issue #74. Now the datepicker is fixed