Connect / Disconnect - Fix