Fixed disconnecting