diff --git a/cli/src/command.rs b/cli/src/command.rs
index 1d6c0bd..31d50ca 100644
--- a/cli/src/command.rs
+++ b/cli/src/command.rs
@@ -38,7 +38,7 @@ use rgb::containers::{
     Supplement, Transfer, UniversalFile,
 };
 use rgb::interface::{AssignmentsFilter, ContractOp, IfaceId};
-use rgb::invoice::{Beneficiary, RgbInvoice, RgbInvoiceBuilder, XChainNet};
+use rgb::invoice::{Beneficiary, Pay2Vout, RgbInvoice, RgbInvoiceBuilder, XChainNet};
 use rgb::persistence::{MemContract, StashReadProvider, Stock};
 use rgb::resolvers::ContractIssueResolver;
 use rgb::schema::SchemaId;
@@ -860,7 +860,7 @@ impl Exec for RgbArgs {
                             .next()
                             .expect("no addresses left")
                             .addr;
-                        Beneficiary::WitnessVout(addr.payload)
+                        Beneficiary::WitnessVout(Pay2Vout::new(addr.payload))
                     }
                     (_, Some(outpoint)) => {
                         let seal =
diff --git a/src/pay.rs b/src/pay.rs
index f87907d..8d60ac9 100644
--- a/src/pay.rs
+++ b/src/pay.rs
@@ -233,9 +233,9 @@ where Self::Descr: DescriptorRgb<K>
         };
         let beneficiaries = match invoice.beneficiary.into_inner() {
             Beneficiary::BlindedSeal(_) => vec![],
-            Beneficiary::WitnessVout(address_payload) => {
+            Beneficiary::WitnessVout(pay2vout) => {
                 vec![BpBeneficiary::new(
-                    Address::new(address_payload, invoice.address_network()),
+                    Address::new(*pay2vout, invoice.address_network()),
                     params.min_amount,
                 )]
             }
@@ -254,8 +254,8 @@ where Self::Descr: DescriptorRgb<K>
             self.construct_psbt(prev_outpoints, &beneficiaries, params.tx)?;
 
         let beneficiary_script =
-            if let Beneficiary::WitnessVout(address_payload) = invoice.beneficiary.into_inner() {
-                Some(address_payload.script_pubkey())
+            if let Beneficiary::WitnessVout(pay2vout) = invoice.beneficiary.into_inner() {
+                Some(pay2vout.script_pubkey())
             } else {
                 None
             };
@@ -280,8 +280,8 @@ where Self::Descr: DescriptorRgb<K>
         }
 
         let beneficiary_vout = match invoice.beneficiary.into_inner() {
-            Beneficiary::WitnessVout(address_payload) => {
-                let s = address_payload.script_pubkey();
+            Beneficiary::WitnessVout(pay2vout) => {
+                let s = (*pay2vout).script_pubkey();
                 let vout = psbt
                     .outputs()
                     .find(|output| output.script == s)
@@ -350,8 +350,8 @@ where Self::Descr: DescriptorRgb<K>
 
         let witness_txid = psbt.txid();
         let (beneficiary1, beneficiary2) = match invoice.beneficiary.into_inner() {
-            Beneficiary::WitnessVout(address_payload) => {
-                let s = address_payload.script_pubkey();
+            Beneficiary::WitnessVout(pay2vout) => {
+                let s = (*pay2vout).script_pubkey();
                 let vout = psbt
                     .outputs()
                     .position(|output| output.script == s)