some parsing fix