diff --git a/qa/rpc-tests/cryptoconditions_oracles.py b/qa/rpc-tests/cryptoconditions_oracles.py
index f295bf020..048b577d1 100755
--- a/qa/rpc-tests/cryptoconditions_oracles.py
+++ b/qa/rpc-tests/cryptoconditions_oracles.py
@@ -112,17 +112,15 @@ class CryptoconditionsOraclesTest(CryptoconditionsTestFramework):
         # baton
         oraclesdata_d = self.send_and_mine(result["hex"], rpc)
         result = rpc.oraclessamples(globals()["oracle_{}".format("d")], oraclesdata_d, "1")
-        # TODO: working not correct now!
-        #assert_equal("[u'01']", str(result["samples"][0]), "Data match")
+        assert_equal("[u'01']", str(result["samples"][0]), "Data match")
 
         # D type
-        result = rpc.oraclesdata(globals()["oracle_{}".format("D")], "0101")
+        result = rpc.oraclesdata(globals()["oracle_{}".format("D")], "010001")
         assert_success(result)
         # baton
         oraclesdata_D = self.send_and_mine(result["hex"], rpc)
         result = rpc.oraclessamples(globals()["oracle_{}".format("D")], oraclesdata_D, "1")
-        # TODO: working not correct now!
-        #assert_equal("[u'01']", str(result["samples"][0]), "Data match")
+        assert_equal("[u'01']", str(result["samples"][0]), "Data match")
 
         # c type
         result = rpc.oraclesdata(globals()["oracle_{}".format("c")], "ff")
@@ -198,12 +196,12 @@ class CryptoconditionsOraclesTest(CryptoconditionsTestFramework):
         assert_equal("[u'ffffffff00000000ffffffff00000000ffffffff00000000ffffffff00000000']", str(result["samples"][0]), "Data match")
 
         # Ihh type
-        result = rpc.oraclesdata(globals()["oracle_{}".format("Ihh")], "00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff")
+        result = rpc.oraclesdata(globals()["oracle_{}".format("Ihh")], "ffffffff00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff00000000ffffffff")
         assert_success(result)
         # baton
         oraclesdata_Ihh = self.send_and_mine(result["hex"], rpc)
         result = rpc.oraclessamples(globals()["oracle_{}".format("Ihh")], oraclesdata_Ihh, "1")
-        assert_equal("[u'0']", str(result["samples"][0]), "Data match")
+        assert_equal("[u'4294967295', u'ffffffff00000000ffffffff00000000ffffffff00000000ffffffff00000000', u'ffffffff00000000ffffffff00000000ffffffff00000000ffffffff00000000']", str(result["samples"][0]), "Data match")
 
 
     def run_test(self):
diff --git a/src/miner.cpp b/src/miner.cpp
index 6c79ef24b..a44eb380c 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -659,6 +659,11 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
             else
             {
                 fprintf(stderr,"error adding notaryvin, need to create 0.0001 utxos\n");
+                if ( ASSETCHAINS_SYMBOL[0] == 0 ||  (ASSETCHAINS_SYMBOL[0] != 0 && !isStake) )
+                {
+                    LEAVE_CRITICAL_SECTION(cs_main);
+                    LEAVE_CRITICAL_SECTION(mempool.cs);
+                }
                 return(0);
             }
         }