diff --git a/src/cc/heir.cpp b/src/cc/heir.cpp
index 97c89582f..c87f8155d 100644
--- a/src/cc/heir.cpp
+++ b/src/cc/heir.cpp
@@ -437,6 +437,7 @@ template <class Helper> uint256 _FindLatestFundingTx(uint256 fundingtxid, uint8_
         return zeroid;
     }
 
+	// TODO: correct cc addr:
     std::vector<std::pair<CAddressUnspentKey, CAddressUnspentValue>> unspentOutputs;
     struct CCcontract_info *cp, C;
     cp = CCinit(&C, EVAL_HEIR);
@@ -703,7 +704,8 @@ template <class Helper> UniValue HeirAdd(uint256 fundingtxid, uint64_t txfee, in
     uint8_t funcId;
 	uint8_t hasHeirSpendingBegun = 0;
 
-	cp = CCinit(&C, Helper::getMyEval());  // for tokens shoud be EVAL_TOKENS to sign it correctly!
+	//cp = CCinit(&C, Helper::getMyEval());  // for tokens shoud be EVAL_TOKENS to sign it correctly!
+	cp = CCinit(&C, EVAL_HEIR);  // for tokens shoud be EVAL_TOKENS to sign it correctly!
 
     if (txfee == 0)
         txfee = 10000;