Fix data format issue