diff --git a/peers.go b/peers.go
index 0a127599..79bcd6e5 100644
--- a/peers.go
+++ b/peers.go
@@ -399,8 +399,8 @@ func (pp *PeerPicker) listPeers() map[string]RemoteFetcher {
 	pp.mu.RLock()
 	defer pp.mu.RUnlock()
 
-	// deep copy of pp.fetchers map.
-	fetchers := make(map[string]RemoteFetcher)
+	// deep copy of fetchers map with size equal to length of pp.fetchers.
+	fetchers := make(map[string]RemoteFetcher, len(pp.fetchers))
 	for p, f := range pp.fetchers {
 		fetchers[p] = f
 	}
diff --git a/peers_test.go b/peers_test.go
index c3636e70..0b4f75be 100644
--- a/peers_test.go
+++ b/peers_test.go
@@ -244,7 +244,7 @@ func TestPeersIncremental(t *testing.T) {
 					fetcherURIs[f.(*TestFetcher).uri] = struct{}{}
 				}
 
-				allFetchers := u.peerPicker.listPeers()
+				allFetchers := u.ListPeers()
 				allPeerIDs := make(map[string]struct{}, len(allFetchers))
 				allFetcherURIs := make(map[string]struct{}, len(allFetchers))
 				for peerID, fetcher := range allFetchers {