pubsub fix