diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index d6255c54f..158afd56f 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -930,6 +930,9 @@ decode_keys_json (const json_t *resp_obj,
       if (GNUNET_YES == found)
       {
         /* 0:0:0 did not support /keys cherry picking */
+
+        /* Okay, but why breaking here? It could be that the
+         * user redownloaded all the keys in a forced way. */
         GNUNET_break_op (0 == current);
         continue;
       }
diff --git a/src/lib/test_exchange_api_overlapping_keys_bug.c b/src/lib/test_exchange_api_overlapping_keys_bug.c
index 01fb46237..253851925 100644
--- a/src/lib/test_exchange_api_overlapping_keys_bug.c
+++ b/src/lib/test_exchange_api_overlapping_keys_bug.c
@@ -89,12 +89,12 @@ run (void *cls,
 
     TALER_TESTING_cmd_check_keys ("first-download",
                                   1,
-                                  4),
+                                  1),
 
     /* Causes GET /keys?last_denom_issue=0 */
     TALER_TESTING_cmd_check_keys_with_last_denom ("second-download",
                                                   3,
-                                                  4,
+                                                  1,
                                                   GNUNET_TIME_UNIT_ZERO_ABS),
     TALER_TESTING_cmd_end ()
   };