Subscriptions 2 issues

Subscriptions 2 issues