Subscription Service fix