fix unsubscribe logic flaw