Fix data formatting