Fix/3.0/client connection