Conn/Disconn fixed