Deal correctly with paragraphs for issue 1044