Code for MatchFinder (Fixed return value)