Fix problem with Subscription
Merge pull request #845 from MarioAriasC/master

Fix problem with Subscription