Fixed issues:
* renewed fix related to subscription process