Matcher now working properly