1 files changed, 8 insertions, 3 deletions

diff --git a/src/Network/BitTorrent/Client/Handle.hs b/src/Network/BitTorrent/Client/Handle.hs
index e7884caa..d68c57cc 100644
--- a/src/Network/BitTorrent/Client/Handle.hs
+++ b/src/Network/BitTorrent/Client/Handle.hs
@@ -78,9 +78,14 @@ openTorrent rootPath t @ Torrent {..} = do
   allocHandle ih $ do
     c @ Client {..} <- getClient
     tses <- liftIO $ Tracker.newSession ih (trackerList t)
-    eses <- liftIO $ Exchange.newSession clientLogger (externalAddr c) rootPath
-                                         tInfoDict
-    return $ Handle ih (idPrivate tInfoDict) tses eses
+    eses <- liftIO $ Exchange.newSession clientLogger (externalAddr c)
+                       rootPath tInfoDict
+    return $ Handle
+      { topic    = ih
+      , private  = idPrivate tInfoDict
+      , trackers = tses
+      , exchange = eses
+      }
 
 -- | Use 'nullMagnet' to open handle from 'InfoHash'.
 openMagnet :: FilePath -> Magnet -> BitTorrent Handle