Fixed the preparation of the messages.