bugs fixed at Matcher