use more reliable matcher