mostly fix reconnecting