pubsub bugs fixed