Fix matchers definition