diff -up ./src/net/common/clientthread.cpp.orig ./src/net/common/clientthread.cpp
--- ./src/net/common/clientthread.cpp.orig	2017-12-28 18:20:20.598505370 +0200
+++ ./src/net/common/clientthread.cpp	2017-12-28 18:22:17.979040182 +0200
@@ -993,8 +993,7 @@ ClientThread::CreateContextSession()
 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6()));
 		else
 			newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4()));
-		boost::asio::socket_base::non_blocking_io command(true);
-		newSock->io_control(command);
+		newSock->non_blocking(true);
 		newSock->set_option(tcp::no_delay(true));
 		newSock->set_option(boost::asio::socket_base::keep_alive(true));
 
diff -up ./src/net/serveraccepthelper.h.orig ./src/net/serveraccepthelper.h
--- ./src/net/serveraccepthelper.h.orig	2017-12-28 18:20:31.532089414 +0200
+++ ./src/net/serveraccepthelper.h	2017-12-28 18:21:03.430875907 +0200
@@ -122,8 +122,7 @@ protected:
 					  const boost::system::error_code &error)
 	{
 		if (!error) {
-			boost::asio::socket_base::non_blocking_io command(true);
-			acceptedSocket->io_control(command);
+			acceptedSocket->non_blocking(true);
 			acceptedSocket->set_option(typename P::no_delay(true));
 			acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true));
 			boost::shared_ptr<SessionData> sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService));