added sanity check to attempt to fix incorrect cfi issues when adding highlights