Add fix for near matches showing false positive at times