fix of messages