Fix for user input and DatePicker