Editing: BaseMatcher.php