better message mapping. issue #1190