Matcher seems to be working well now.