Fixed issues with subscription.