Fix for Message semantics