diff --git a/birdvisu/topo_v3.py b/birdvisu/topo_v3.py
index add1604..f11e59f 100644
--- a/birdvisu/topo_v3.py
+++ b/birdvisu/topo_v3.py
@@ -269,9 +269,13 @@ class VertexFinder:
 		self.topologies.append(topo)
 		for v in topo.vertices:
 			id = v.id
-			self.vertices[id].add(topo)
+			self.vertices[id].append(topo)
 			# Add to various "indices"
-			self.by_addr[id.address].add(id)
+			if isinstance(id.address, tuple):
+				for addr in id.address:
+					self.by_addr[addr].add(id)
+			else:
+				self.by_addr[id.address].add(id)
 			self.by_rid[id.router_id].add(id)
 			self.by_dr[id.dr_id].add(id)
 			self.by_discriminator[id.discriminator].add(id)