Bugfixing when connecting to multiple servers