Fixed problem with data conversion