Important data parsing fix