fixed message enhancing