Improved disconnecting