More robust reconnecting