fix in pub/sub pattern