Non static match condition

Review PR
can be protected, since it is duplicated in DirectAnalyser