bug fix in messages