fix rpc/pubsub inconsistency