fix some parsing