Fix #72 for MatcherMode