Improvement disconnect handling