Fix bug with the change of message display