diff --git a/websocket.py b/websocket.py
index ba29f16..90346a5 100755
--- a/websocket.py
+++ b/websocket.py
@@ -736,12 +736,12 @@ Sec-WebSocket-Accept: %s\r
         is a WebSockets client then call new_client() method (which must
         be overridden) for each new client connection.
         """
-        addr = WebSocketServer.addrinfo(self.listen_host, self.listen_port)
+        addr = self.addrinfo(self.listen_host, self.listen_port)
         lsock = socket.socket(addr[0], addr[1])
         lsock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         lsock.bind((self.listen_host, self.listen_port))
         lsock.listen(100)
-                    
+
         if self.daemon:
             self.daemonize(keepfd=lsock.fileno(), chdir=self.web)
 
diff --git a/websockify b/websockify
index 1362de3..8ee48cb 100755
--- a/websockify
+++ b/websockify
@@ -141,10 +141,10 @@ Traffic Legend:
         # Connect to the target
         self.msg("connecting to: %s:%s" % (
                  self.target_host, self.target_port))
-        addr = WebSocketServer.addrinfo(self.target_host, self.target_port)
+        addr = self.addrinfo(self.target_host, self.target_port)
         tsock = socket.socket(addr[0], addr[1])
         tsock.connect((self.target_host, self.target_port))
-                                
+
         if self.verbose and not self.daemon:
             print(self.traffic_legend)