diff --git a/utils/he_ipv6/tunnel.py b/utils/he_ipv6/tunnel.py
index 100f26a..2786ab6 100644
--- a/utils/he_ipv6/tunnel.py
+++ b/utils/he_ipv6/tunnel.py
@@ -165,6 +165,7 @@ class Tunnel(object):
         self._creds()
         self._client()
         self._server()
+        self._endpoint()
         self._allocations()
         self._assignments()
         self._radvd()
diff --git a/utils/he_ipv6/tunnelbroker.py b/utils/he_ipv6/tunnelbroker.py
index 77bb851..06d2e4d 100644
--- a/utils/he_ipv6/tunnelbroker.py
+++ b/utils/he_ipv6/tunnelbroker.py
@@ -90,14 +90,14 @@ class TunnelBroker(object):
                      ifname = self.iface_name,
                      kind = 'sit',
                      sit_local = self.my_ip.str,
-                     sit_remote = self.tun.server.str,
+                     sit_remote = self.tun.endpoint.str,
                      sit_ttl = 255)
             logger.debug('Added link {0} successfully.'.format(self.iface_name))
         except Exception as e:
             logger.error('Could not create link for link {0} '
                          '(maybe it already exists?) with local {1} and remote {2}: {3}'.format(self.iface_name,
                                                                                                 self.my_ip.str,
-                                                                                                self.tun.server.str,
+                                                                                                self.tun.endpoint.str,
                                                                                                 e))
             ipr.close()
             raise e