fixed message decorator