Fix parsing of the message argument