Fixed errors in data parsing