Fixed bug related to data conversion