Fixed connection issue