fix pubsub issue on binary switch