Resolve syntax error resulting from message refactor