Fix subscribe/unsubscribe not happening immediately