Fix data parsing