Improved re-subscription logic