Connection leak fix