Fix bug with messages