diff --git a/src/main/java/org/filesys/netbios/server/NetBIOSNameServer.java b/src/main/java/org/filesys/netbios/server/NetBIOSNameServer.java
index 22fd9a9..810eb6d 100644
--- a/src/main/java/org/filesys/netbios/server/NetBIOSNameServer.java
+++ b/src/main/java/org/filesys/netbios/server/NetBIOSNameServer.java
@@ -1275,12 +1275,12 @@ public void run() {
 
                 //	Get a list of all the local addresses
                 InetAddress[] addrs = InetAddress.getAllByName(InetAddress.getLocalHost().getHostName());
+                final Set<String> invalidAddresses = new HashSet<>(Arrays.asList("0.0.0.0", "127.0.0.1", "::1"));
 
                 for (int i = 0; i < addrs.length; i++) {
 
-                    //	Check for a valid address, filter out '127.0.0.1' and '0.0.0.0' addresses
-                    if (addrs[i].getHostAddress().equals("127.0.0.1") == false &&
-                            addrs[i].getHostAddress().equals("0.0.0.0") == false)
+                    //	Check for a valid address, filter out loopback and '0.0.0.0' addresses
+                    if (!invalidAddresses.contains(addrs[i].getHostAddress()))
                         ipList.addElement(addrs[i].getAddress());
                 }
 
@@ -1304,8 +1304,7 @@ public void run() {
                                 while (niAddrs.hasMoreElements()) {
                                     InetAddress curAddr = (InetAddress) niAddrs.nextElement();
 
-                                    if (curAddr.getHostAddress().equals("127.0.0.1") == false &&
-                                            curAddr.getHostAddress().equals("0.0.0.0") == false)
+                                    if (!invalidAddresses.contains(curAddr.getHostAddress()))
                                         ipList.add(curAddr.getAddress());
                                 }
                             }