Fix pub/sub