Fixed string matching in Matcher class