Fix createMessage