diff --git a/src/cc/channels.cpp b/src/cc/channels.cpp
index ca069ee57..fd20314bb 100644
--- a/src/cc/channels.cpp
+++ b/src/cc/channels.cpp
@@ -106,12 +106,12 @@ CScript EncodeChannelsOpRet(uint8_t funcid,uint256 tokenid,uint256 opentxid,CPub
 
 uint8_t DecodeChannelsOpRet(const CScript &scriptPubKey, uint256 &tokenid, uint256 &opentxid, CPubKey &srcpub,CPubKey &destpub,int32_t &numpayments,int64_t &payment,uint256 &hashchain)
 {
-    std::vector<uint8_t> vopret; uint8_t *script,e,f,tokenevalcode;
-    std::vector<CPubKey> pubkeys; std::vector<uint8_t> vOpretExtra;
+    std::vector<uint8_t> vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode;
+    std::vector<CPubKey> pubkeys;
 
     if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys,vOpretExtra)!=0 && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0)
     {
-        if (!E_UNMARSHAL(vOpretExtra, { ss >> vopret; })) return (0);
+        vopret=vOpretExtra;
     }
     else GetOpReturnData(scriptPubKey, vopret);
     if ( vopret.size() > 2 )
diff --git a/src/cc/gateways.cpp b/src/cc/gateways.cpp
index 41cd37e3a..5d803a80e 100644
--- a/src/cc/gateways.cpp
+++ b/src/cc/gateways.cpp
@@ -167,12 +167,11 @@ CScript EncodeGatewaysBindOpRet(uint8_t funcid,uint256 tokenid,std::string coin,
 
 uint8_t DecodeGatewaysBindOpRet(char *depositaddr,const CScript &scriptPubKey,uint256 &tokenid,std::string &coin,int64_t &totalsupply,uint256 &oracletxid,uint8_t &M,uint8_t &N,std::vector<CPubKey> &gatewaypubkeys,uint8_t &taddr,uint8_t &prefix,uint8_t &prefix2,uint8_t wiftype)
 {
-    std::vector<uint8_t> vopret; uint8_t *script,e,f,tokenevalcode;
-    std::vector<uint8_t> vOpretExtra; std::vector<CPubKey> pubkeys;
+    std::vector<uint8_t> vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector<CPubKey> pubkeys;
 
     if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys,vOpretExtra)!=0 && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0)
     {
-        if (!E_UNMARSHAL(vOpretExtra, { ss >> vopret; })) return (0);
+        vopret=vOpretExtra;
     }
     else GetOpReturnData(scriptPubKey, vopret);
     script = (uint8_t *)vopret.data();
@@ -230,12 +229,11 @@ CScript EncodeGatewaysClaimOpRet(uint8_t funcid,uint256 tokenid,uint256 bindtxid
 
 uint8_t DecodeGatewaysClaimOpRet(const CScript &scriptPubKey,uint256 &tokenid,uint256 &bindtxid,std::string &refcoin,uint256 &deposittxid,CPubKey &destpub,int64_t &amount)
 {
-    std::vector<uint8_t> vopret; uint8_t *script,e,f,tokenevalcode;
-    std::vector<CPubKey> pubkeys; std::vector<uint8_t> vOpretExtra;
+    std::vector<uint8_t> vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector<CPubKey> pubkeys;
 
     if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys,vOpretExtra)!=0 && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0)
     {
-        if (!E_UNMARSHAL(vOpretExtra, { ss >> vopret; })) return (0);
+        vopret=vOpretExtra;
     }
     else GetOpReturnData(scriptPubKey, vopret);
     script = (uint8_t *)vopret.data();
@@ -260,12 +258,11 @@ CScript EncodeGatewaysWithdrawOpRet(uint8_t funcid,uint256 tokenid,uint256 bindt
 
 uint8_t DecodeGatewaysWithdrawOpRet(const CScript &scriptPubKey, uint256& tokenid, uint256 &bindtxid, std::string &refcoin, CPubKey &withdrawpub, int64_t &amount)
 {
-    std::vector<uint8_t> vopret; uint8_t *script,e,f,tokenevalcode;
-    std::vector<CPubKey> pubkeys; std::vector<uint8_t> vOpretExtra;
+    std::vector<uint8_t> vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector<CPubKey> pubkeys;
 
     if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys,vOpretExtra)!=0 && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0)
     {
-        if (!E_UNMARSHAL(vOpretExtra, { ss >> vopret; })) return (0);
+        vopret=vOpretExtra;
     }
     else GetOpReturnData(scriptPubKey, vopret);
     script = (uint8_t *)vopret.data();
@@ -339,12 +336,11 @@ uint8_t DecodeGatewaysMarkDoneOpRet(const CScript &scriptPubKey, uint256 &withdr
 
 uint8_t DecodeGatewaysOpRet(const CScript &scriptPubKey)
 {
-    std::vector<uint8_t> vopret; uint8_t *script,e,f,tokenevalcode;
-    std::vector<CPubKey> pubkeys; std::vector<uint8_t> vOpretExtra; uint256 tokenid;
+    std::vector<uint8_t> vopret,vOpretExtra; uint8_t *script,e,f,tokenevalcode; std::vector<CPubKey> pubkeys; uint256 tokenid;
 
     if (DecodeTokenOpRet(scriptPubKey,tokenevalcode,tokenid,pubkeys,vOpretExtra)!=0 && tokenevalcode==EVAL_TOKENS && vOpretExtra.size()>0)
     {
-        if (!E_UNMARSHAL(vOpretExtra, { ss >> vopret; })) return (0);
+        vopret=vOpretExtra;
     }
     else GetOpReturnData(scriptPubKey, vopret);
     script = (uint8_t *)vopret.data();