Fix data convertion