diff --git a/bfclient/src/bf/Brainflyer.cpp b/bfclient/src/bf/Brainflyer.cpp
index 427fee4..84bc697 100644
--- a/bfclient/src/bf/Brainflyer.cpp
+++ b/bfclient/src/bf/Brainflyer.cpp
@@ -82,6 +82,7 @@ void Brainflyer::performWork(comm::Work& work) {
     secp256k1_ec_pubkey_batch_incr(4096, nopt_mod, pub_batch, priv_batch, priv);
     keys += 4096;
     memcpy(priv, priv_batch[4096 - 1], 32);  // set next starting key
+    priv_add_uint32(priv, nopt_mod);
 
     int i = checkBatch(pub_batch, 4096);
     if (i != -1) {
diff --git a/bfclient/src/bfclient.cpp b/bfclient/src/bfclient.cpp
index 7a0e7a8..e50200f 100644
--- a/bfclient/src/bfclient.cpp
+++ b/bfclient/src/bfclient.cpp
@@ -35,7 +35,7 @@ int main() {
   thread* threads = new thread[numThreads];
   cout << "Starting " << numThreads << " threads" << endl;
 
-  //numThreads = 1;
+  numThreads = 1;
   for (unsigned int i = 0; i < numThreads; i++) {
     threads[i] = thread{bf::Brainflyer(i, "127.0.0.1", 26765, key)};
   }
diff --git a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/MultiStagedServer.java b/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/MultiStagedServer.java
index addf2bd..8f19492 100644
--- a/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/MultiStagedServer.java
+++ b/cnc/src/main/java/org/btcollider/cnc/keysrv/impl/multistage/MultiStagedServer.java
@@ -51,7 +51,7 @@ public class MultiStagedServer implements KeyServer {
 		KeyRange kr = null;
 		
 		if ( (kr = keyRangeBuffer.getRange()) == null) { // Get retracted KR from buffer if one exists
-			secKTS.getRange(); // else: get a random range from the subspace
+			kr = secKTS.getRange(); // else: get a random range from the subspace
 		}
 		
 		if (kr == null) { // sub-range finished