fix data parsing