Fixing subscribe/unsubscribe workflow.