1 files changed, 6 insertions, 2 deletions

diff --git a/src/Network/Tox.hs b/src/Network/Tox.hs
index af8114f4..c587578d 100644
--- a/src/Network/Tox.hs
+++ b/src/Network/Tox.hs
@@ -155,6 +155,9 @@ gen g = let (bs, g')  = randomBytesGenerate 24 g
 intKey :: DHT.TransactionId -> Int
 intKey (DHT.TransactionId (Nonce8 w) _) = fromIntegral w
 
+w64Key :: DHT.TransactionId -> Word64
+w64Key (DHT.TransactionId (Nonce8 w) _) = w
+
 nonceKey :: DHT.TransactionId -> Nonce8
 nonceKey (DHT.TransactionId n _) = n
 
@@ -178,6 +181,7 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
     -- If we have 8-byte keys for IntMap, then use it for transaction lookups.
     -- Otherwise, use ordinary Map.  The details of which will be hidden by an
     -- existential closure (see mkclient below).
+    --
     tblvar <-
       if fitsInInt (Proxy :: Proxy Word64)
         then do
@@ -185,9 +189,9 @@ newClient drg net classify selfAddr handlers modifytbl modifynet = do
             intmap_var <- atomically $ newTVar (drg, mempty)
             return $ Right (intmapT,intmap_var)
          else do
-            let mapT = transactionMethods (contramap nonceKey mapMethods) gen
+            let word64mapT = transactionMethods (contramap w64key w64MapMethods) gen
             map_var <- atomically $ newTVar (drg, mempty)
-            return $ Left (mapT,map_var)
+            return $ Left (word64mapT,map_var)
     let dispatch tbl var handlers = DispatchMethods
                 { classifyInbound = classify
                 , lookupHandler = handlers -- var