Improved stability of pubsub