fix pubsub