Fixing the message encoding (issue #2).