Fixed manual disconnection