improvement to reconnect after disconnect handling