Fix bug Messages