Fix publish/subscribe