pub/sub fix