diff --git a/Jupiter b/Jupiter
index 4d20ab6..8cc73c9 160000
--- a/Jupiter
+++ b/Jupiter
@@ -1 +1 @@
-Subproject commit 4d20ab64300ba49a923c712106dd2a040fa95bcc
+Subproject commit 8cc73c997a35d8abedd64dcd45b1016c57330000
diff --git a/Release/Bot.lib b/Release/Bot.lib
index fa185c7..aa7a524 100644
Binary files a/Release/Bot.lib and b/Release/Bot.lib differ
diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib
index 0ebe22e..319c655 100644
Binary files a/Release/Plugins/RenX.Core.lib and b/Release/Plugins/RenX.Core.lib differ
diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp
index ffa1c68..87f8b26 100644
--- a/RenX.Core/RenX_Server.cpp
+++ b/RenX.Core/RenX_Server.cpp
@@ -620,12 +620,12 @@ unsigned short RenX::Server::getPort() const
 
 const Jupiter::ReadableString &RenX::Server::getSocketHostname() const
 {
-	return RenX::Server::sock.getHostname();
+	return RenX::Server::sock.getRemoteHostname();
 }
 
 unsigned short RenX::Server::getSocketPort() const
 {
-	return RenX::Server::sock.getPort();
+	return RenX::Server::sock.getRemotePort();
 }
 
 std::chrono::steady_clock::time_point RenX::Server::getLastAttempt() const
@@ -2559,7 +2559,6 @@ bool RenX::Server::connect()
 		RenX::Server::attempts = 0;
 		return true;
 	}
-	RenX::Server::sock.closeSocket();
 	RenX::Server::connected = false;
 	++RenX::Server::attempts;
 	return false;
@@ -2608,7 +2607,7 @@ const Jupiter::ReadableString &RenX::Server::getRCONUsername() const
 RenX::Server::Server(Jupiter::Socket &&socket, const Jupiter::ReadableString &configurationSection) : Server(configurationSection)
 {
 	RenX::Server::sock = std::move(socket);
-	RenX::Server::hostname = RenX::Server::sock.getHostname();
+	RenX::Server::hostname = RenX::Server::sock.getRemoteHostname();
 	RenX::Server::sock.send(Jupiter::StringS::Format("a%.*s\n", RenX::Server::pass.size(), RenX::Server::pass.ptr()));
 	RenX::Server::connected = true;
 	RenX::Server::silenceParts = false;
diff --git a/RenX.Listen/RenX_Listen.cpp b/RenX.Listen/RenX_Listen.cpp
index 280637b..83359b4 100644
--- a/RenX.Listen/RenX_Listen.cpp
+++ b/RenX.Listen/RenX_Listen.cpp
@@ -56,7 +56,7 @@ int RenX_ListenPlugin::OnRehash()
 	uint16_t port = Jupiter::IRC::Client::Config->getInt(this->getName(), STRING_LITERAL_AS_REFERENCE("Port"), 21337);
 	const Jupiter::ReadableString &address = Jupiter::IRC::Client::Config->get(this->getName(), STRING_LITERAL_AS_REFERENCE("Address"), STRING_LITERAL_AS_REFERENCE("0.0.0.0"));
 	RenX_ListenPlugin::serverSection = Jupiter::IRC::Client::Config->get(this->getName(), STRING_LITERAL_AS_REFERENCE("ServerSection"), this->getName());
-	if (port != RenX_ListenPlugin::socket.getPort() || address.equals(RenX_ListenPlugin::socket.getHostname()) == false)
+	if (port != RenX_ListenPlugin::socket.getRemotePort() || address.equals(RenX_ListenPlugin::socket.getRemoteHostname()) == false)
 	{
 		puts("Notice: The Renegade-X listening socket has been changed!");
 		RenX_ListenPlugin::socket.closeSocket();