diff --git a/api.go b/api.go
index 216ae027e..a99828e96 100644
--- a/api.go
+++ b/api.go
@@ -662,6 +662,5 @@ func ListenAndServe(addr string, srv *Server, logging bool) error {
 			r.Path(localRoute).Methods(localMethod).HandlerFunc(f)
 		}
 	}
-
 	return http.ListenAndServe(addr, r)
 }
diff --git a/commands.go b/commands.go
index 1c83e3045..862222513 100644
--- a/commands.go
+++ b/commands.go
@@ -36,7 +36,7 @@ func (cli *DockerCli) getMethod(name string) (reflect.Method, bool) {
 }
 
 func ParseCommands(addr string, port int, args ...string) error {
-	cli := NewDockerCli("0.0.0.0", 4243)
+	cli := NewDockerCli(addr, port)
 
 	if len(args) > 0 {
 		method, exists := cli.getMethod(args[0])