Fix pub/sub pattern