Non static match condition

Review PR
That's what we actually want. If not then getMatchCondition will never be null and all the check that we are doing will always be true.