Fix service connection leakage