improved robustness on disconnection