Better reconnecting behavior