Fix data parsing bug