diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index ddce699f7f..ae35a9367a 100644
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -16,8 +16,8 @@
 * with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __WORLDTCPSESSION_H__
-#define __WORLDTCPSESSION_H__
+#ifndef __WORLDSOCKET_H__
+#define __WORLDSOCKET_H__
 
 #include <memory>
 #include <chrono>
diff --git a/src/server/shared/Networking/AsyncAcceptor.h b/src/server/shared/Networking/AsyncAcceptor.h
index fbb0313381..eade15fb5f 100644
--- a/src/server/shared/Networking/AsyncAcceptor.h
+++ b/src/server/shared/Networking/AsyncAcceptor.h
@@ -33,14 +33,17 @@ public:
         AsyncAccept();
     };
 
-    AsyncAcceptor(boost::asio::io_service& ioService, std::string bindIp, int port, bool tcpNoDelay) : 
-        AsyncAcceptor(ioService, bindIp, port)
+    AsyncAcceptor(boost::asio::io_service& ioService, std::string bindIp, int port, bool tcpNoDelay) :
+        _socket(ioService),
+        _acceptor(ioService, tcp::endpoint(boost::asio::ip::address::from_string(bindIp), port))
     {
         _socket.set_option(boost::asio::ip::tcp::no_delay(tcpNoDelay));
+
+        AsyncAccept();
     };
 
 private:
-    void AsyncAcceptor::AsyncAccept()
+    void AsyncAccept()
     {
         _acceptor.async_accept(_socket, [this](boost::system::error_code error)
         {