fix raw data parsing