Added Disconnect on close