Fix Message.json transformation - so the original value is not changed