Fixing non passing subscription issue
Merge pull request #348 from andrerod/dev

Fixing non passing subscription issue