What appears to now be proper handling of reconnect