subscription_id save fix