Fix new connection issue