1 files changed, 2 insertions, 1 deletions

diff --git a/dht/src/Network/BitTorrent/MainlineDHT.hs b/dht/src/Network/BitTorrent/MainlineDHT.hs
index af618ba4..2ea2551e 100644
--- a/dht/src/Network/BitTorrent/MainlineDHT.hs
+++ b/dht/src/Network/BitTorrent/MainlineDHT.hs
@@ -659,13 +659,14 @@ newClient swarms addr = do
     refresh_thread4 <- forkPollForRefresh $ refresher4 routing
     refresh_thread6 <- forkPollForRefresh $ refresher6 routing
 
-    forkAnnouncedInfohashesGC (contactInfo swarms)
+    gc_peers <- forkAnnouncedInfohashesGC (contactInfo swarms)
 
     return (client, routing, bootstrap (refresher4 routing), bootstrap (refresher6 routing)
            , do killThread refresh_thread4 -- TODO: Better termination mechanism.
                 killThread refresh_thread6 -- TODO: Better termination mechanism.
                 atomically $ writeTChan addr4 Nothing -- Terminate "addr4" thread.
                 atomically $ writeTChan addr6 Nothing -- Terminate "addr6" thread.
+                killThread gc_peers
                 )
 
 -- Note that you should call .put() every hour for content that you want to