Fix re-subscribe