diff --git a/crypto1_bs_crack.c b/crypto1_bs_crack.c
index 12b537d..d211609 100644
--- a/crypto1_bs_crack.c
+++ b/crypto1_bs_crack.c
@@ -209,6 +209,7 @@ inline uint64_t crack_states_bitsliced(uint32_t **task){
             for(size_t results_idx = 0; results_idx < MAX_BITSLICES; ++results_idx){
                 if(get_vector_bit(results_idx, results)){
                     key = keys[results_idx].value;
+                    __sync_fetch_and_add(&keys_found, 1);
                     goto out;
                 }
             }
diff --git a/libnfc_crypto1_crack.c b/libnfc_crypto1_crack.c
index 30a842b..10c37be 100644
--- a/libnfc_crypto1_crack.c
+++ b/libnfc_crypto1_crack.c
@@ -487,9 +487,6 @@ void* crack_states_thread(void* x){
         const uint64_t key = crack_states_bitsliced(space + j * 5);
         if(key != -1){
             found_key = key;
-            __sync_fetch_and_add(&keys_found, 1);
-            break;
-        } else if(keys_found){
             break;
         }
     }
diff --git a/solve_bs.c b/solve_bs.c
index 0585d61..fc5ef99 100644
--- a/solve_bs.c
+++ b/solve_bs.c
@@ -27,7 +27,6 @@ void* crack_states_thread(void* x){
         const uint64_t key = crack_states_bitsliced(space + j * 5);
         if(key != -1){
             printf("Found key: %012"llx"\n", key);
-            __sync_fetch_and_add(&keys_found, 1);
             break;
         } else if(keys_found){
             break;
diff --git a/solve_piwi.c b/solve_piwi.c
index 748fe4e..1526e09 100644
--- a/solve_piwi.c
+++ b/solve_piwi.c
@@ -45,7 +45,6 @@ uint32_t **space;
 size_t thread_count;
 size_t states_tested = 0;
 size_t total_states;
-size_t keys_found = 0;
 
 void* crack_states_thread(void* x){
     const size_t thread_id = (size_t)x;
diff --git a/solve_piwi_bs.c b/solve_piwi_bs.c
index a0208fd..2bce609 100644
--- a/solve_piwi_bs.c
+++ b/solve_piwi_bs.c
@@ -52,7 +52,6 @@ void* crack_states_thread(void* x){
         const uint64_t key = crack_states_bitsliced(space + j * 5);
         if(key != -1){
             printf("Found key: %012"llx"\n", key);
-            __sync_fetch_and_add(&keys_found, 1);
             break;
         } else if(keys_found){
             break;