Fixing connection setup to protocol v1 and v2