fix unsubscribe behaviour