Adding DisposeAll and fix the Patch due disconnect