Fix service connection issue