Fix disconnecting