Fix second part of messages