dontNotifyOnDisconnect and fix in NotifyOnDisconnect