diff --git a/src/miner.cpp b/src/miner.cpp
index 388de0ba7..9e60753a9 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -769,7 +769,7 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey, int32_t nHeight,
         scriptPubKey = CScript() << ParseHex(NOTARY_PUBKEY) << OP_CHECKSIG;
     } else
     {
-        if (!isStake && ASSETCHAINS_STAKED != 0)
+        if (!isStake || ASSETCHAINS_STAKED != 0)
         {
             if (!reservekey.GetReservedKey(pubkey))
             {
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 368f68921..9285a1258 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -344,7 +344,10 @@ UniValue setgenerate(const UniValue& params, bool fHelp)
     {
         VERUS_MINTBLOCKS = 1;
         fGenerate = GetBoolArg("-gen", false);
-        nGenProcLimit = KOMODO_MININGTHREADS;
+        if ( ASSETCHAINS_STAKED != 0 )
+            nGenProcLimit = KOMODO_MININGTHREADS;
+        else
+            KOMODO_MININGTHREADS = nGenProcLimit;
     }
     else if (!fGenerate)
     {
@@ -353,8 +356,6 @@ UniValue setgenerate(const UniValue& params, bool fHelp)
     }
     else KOMODO_MININGTHREADS = (int32_t)nGenProcLimit;
 
-    fprintf(stderr, "BEFORE MAP miningthreads.%i generate.%i\n",KOMODO_MININGTHREADS,(fGenerate ? 1 : 0));
-
     mapArgs["-gen"] = (fGenerate ? "1" : "0");
     mapArgs ["-genproclimit"] = itostr(KOMODO_MININGTHREADS);