Small change to match finder