message passing bug fix