[BUGFIX] Ensure connection can be established multiple times