Fix incorrect string references in matching