Fixed XPathMatcher