Fixed to work with multiline messages