1 files changed, 3 insertions, 2 deletions

diff --git a/src/Network/BitTorrent/DHT/Session.hs b/src/Network/BitTorrent/DHT/Session.hs
index c08021c7..8dc3f7ac 100644
--- a/src/Network/BitTorrent/DHT/Session.hs
+++ b/src/Network/BitTorrent/DHT/Session.hs
@@ -395,8 +395,9 @@ routableAddress = do
 myNodeIdAccordingTo :: NodeAddr ip -> DHT ip NodeId
 myNodeIdAccordingTo _ = do
   info <- asks routingInfo >>= liftIO . atomically . readTVar
-  fallback <- asks tentativeNodeId
-  return $ maybe fallback myNodeId info
+  maybe (asks tentativeNodeId)
+        (return . myNodeId)
+        info
 
 -- | Get current routing table. Normally you don't need to use this
 -- function, but it can be usefull for debugging and profiling purposes.