Fix for creating message.