matching algorithm hotfix