Fixes issue on double-unsubscribe