Fix bug in messages