Minor improvement on subscriptions