Fixed publish/subscribe