Fix a bug in subscriptions