Subscription Persist Fix