Fix the connection issue