Fix pubsub