Bugfix, ensure only one connection is active