Fixes a bug on the subscriptions