Modify match method to get correct value for find match target.