diff --git a/src/cc/CCtx.cpp b/src/cc/CCtx.cpp
index 201adb074..b5208ced5 100644
--- a/src/cc/CCtx.cpp
+++ b/src/cc/CCtx.cpp
@@ -58,7 +58,7 @@ std::string FinalizeCCTx(uint8_t evalcode,CMutableTransaction &mtx,CPubKey mypk,
     mycond = MakeCC(evalcode,mypk);
     GetCCaddress(evalcode,unspendable,unspendablepk);
     othercond = MakeCC(evalcode,unspendablepk);
-    //fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
+    fprintf(stderr,"myCCaddr.(%s) %p vs unspendable.(%s) %p\n",myaddr,mycond,unspendable,othercond);
     memset(utxovalues,0,sizeof(utxovalues));
     for (i=0; i<n; i++)
     {
diff --git a/src/cc/CCutils.cpp b/src/cc/CCutils.cpp
index b761090e1..f5576b239 100644
--- a/src/cc/CCutils.cpp
+++ b/src/cc/CCutils.cpp
@@ -92,7 +92,10 @@ bool ConstrainVout(CTxOut vout,int32_t CCflag,char *cmpaddr,uint64_t nValue)
 {
     char destaddr[64];
     if ( vout.scriptPubKey.IsPayToCryptoCondition() != CCflag )
+    {
+        fprintf(stderr,"constrain vout error isCC %d vs %d CCflag\n",vout.scriptPubKey.IsPayToCryptoCondition(),CCflag);
         return(false);
+    }
     else if ( cmpaddr != 0 && (Getscriptaddress(destaddr,vout.scriptPubKey) == 0 || strcmp(destaddr,cmpaddr) != 0) )
         return(false);
     else if ( (nValue == 0 && vout.nValue < 10000) || nValue != vout.nValue )
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index b1b69b90f..f83b9e7e2 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -112,6 +112,33 @@ bool ProcessFaucet(Eval* eval, std::vector<uint8_t> paramsNull,const CTransactio
     } else return(false);
 }
 
+uint64_t AddFaucetInputs(CMutableTransaction &mtx,CPubKey pk,uint256 assetid,uint64_t total,int32_t maxinputs)
+{
+    char coinaddr[64]; uint64_t nValue,price,totalinputs = 0; uint256 txid,hashBlock; std::vector<uint8_t> origpubkey; CTransaction vintx; int32_t n = 0;
+    std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> > unspentOutputs;
+    GetCCaddress(EVAL_FAUCET,coinaddr,pk);
+    SetCCunspents(unspentOutputs,coinaddr);
+    //std::sort(unspentOutputs.begin(), unspentOutputs.end(), heightSort);
+    for (std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue> >::const_iterator it=unspentOutputs.begin(); it!=unspentOutputs.end(); it++)
+    {
+        txid = it->first.txhash;
+        if ( GetTransaction(txid,vintx,hashBlock,false) != 0 )
+        {
+            if ( (nValue= IsFaucetvout(price,origpubkey,vintx,(int32_t)it->first.index,assetid)) > 0 )
+            {
+                if ( total != 0 && maxinputs != 0 )
+                    mtx.vin.push_back(CTxIn(txid,(int32_t)it->first.index,CScript()));
+                nValue = it->second.satoshis;
+                totalinputs += nValue;
+                n++;
+                if ( (total > 0 && totalinputs >= total) || (maxinputs > 0 && n >= maxinputs) )
+                    break;
+            }
+        }
+    }
+    return(totalinputs);
+}
+
 std::string FaucetFund(uint64_t txfee,uint64_t funds)
 {
     CMutableTransaction mtx; CPubKey mypk,faucetpk; CScript opret;