Fix to Subscription
Merge pull request #676 from hzahoori/subscriptionfix

Fix to Subscription