Return correct match strategy #5337