raw data parsing fix