LPS-32153 Fix bug with comment and root message