Fix bug with message