Non static match condition

Review PR.