fix subscriptions bugs