diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
index f1ef08eb18c914b1505f29a5aeb532128df92dd2..8311e6b6ecba0f50c79e907fd15eaa93a6e15bb4 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@@ -1439,6 +1439,7 @@ class PeerCoordinator implements PeerListener
 
   /**
    *  Called by TrackerClient
+   *  @return the Set itself, modifiable, not a copy, caller should clear()
    *  @since 0.8.4
    */
   Set<PeerID> getPEXPeers() {
diff --git a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
index 6a821f2ba7a1c511739ec87a2ca5a65ee851049b..d6cf2fe7cadf931c1c98ecdc9124d1b2d2211ce0 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/TrackerClient.java
@@ -560,6 +560,7 @@ public class TrackerClient implements Runnable {
                          }
                     }
                     rv = pids.size();
+                    pids.clear();
                 }
             } else {
                 if (_log.shouldLog(Log.INFO))