diff --git a/libp2p/kademlia/kad_peerinfo.py b/libp2p/kademlia/kad_peerinfo.py
index 548dd701..cd0bc604 100644
--- a/libp2p/kademlia/kad_peerinfo.py
+++ b/libp2p/kademlia/kad_peerinfo.py
@@ -29,8 +29,7 @@ class KadPeerInfo(PeerInfo):
 
 
     def same_home_as(self, node):
-        #TODO: handle more than one addr
-        return self.addrs[0] == node.addrs[0]
+        return sorted(self.addrs) == sorted(node.addrs)
 
     def distance_to(self, node):
         """