diff --git a/java/com/tigervnc/network/TcpListener.java b/java/com/tigervnc/network/TcpListener.java
index afe8075..d6e92ab 100644
--- a/java/com/tigervnc/network/TcpListener.java
+++ b/java/com/tigervnc/network/TcpListener.java
@@ -59,9 +59,7 @@
       } else if (listenaddr != null) {
           addr = java.net.InetAddress.getByName(listenaddr);
       } else {
-        // FIXME: need to be sure we get the wildcard address?
-        addr = InetAddress.getByName(null);
-        //addr = InetAddress.getLocalHost();
+        addr = InetAddress.getByName("0.0.0.0");
       }
     } catch (UnknownHostException e) {
       System.out.println(e.toString());