#49: I think this should make dis-and-reconnecting more reliable, too