Fix connection issue