further fix in message passing