Fix Multi connect/disconnect