Fixing connection issue