Fix data formatter