Stricter matching