Resolve match generation issue