Fix MatchException