fixed some issues with identical subscriptions