Small hack to get pub/sub working