diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp
index a6a1874..7c11cfc 100644
--- a/FlippR-Driver/networking/FlippRServer.cpp
+++ b/FlippR-Driver/networking/FlippRServer.cpp
@@ -182,7 +182,7 @@ HTTPServer* FlippRServer::build_output_server()
   unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port);
 
   std::string path = this->create_directory(OUTPUT_SOCKET_NAME);
-  SocketAddress address(path);
+  SocketAddress address(path, port);
   ServerSocket server_socket(address);
 
   return new HTTPServer(new OutputRequestHandlerFactory(this->output_driver), server_socket, new HTTPServerParams);
@@ -190,13 +190,13 @@ HTTPServer* FlippRServer::build_output_server()
 
 TCPServer* FlippRServer::build_input_server()
 {
-  unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->output_port);
+  unsigned short port = (unsigned short) config().getInt("FlippRServer.port", this->input_port);
 
   std::string path = this->create_directory(INPUT_SOCKET_NAME);
-  SocketAddress address(path);
+  SocketAddress address(path, port);
   ServerSocket server_socket(address);
 
-  return new TCPServer(new input::InputSocketHandlerFactory(this->input_driver), port);
+  return new TCPServer(new input::InputSocketHandlerFactory(this->input_driver), server_socket, new HTTPServerParams);
 }
 
 std::string FlippRServer::create_directory(std::string file_name)