fix initialization of Matcher per new signature