Fixed #206 DataPicker datatype is broken