Fixing DatePicker (refs: #440)