Fix  Calling connect() while still connected, missing disconnect()