diff --git a/plugins/comment_paragraph/lib/comment_paragraph_plugin.rb b/plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
index c0c2b8c..b91c2b0 100644
--- a/plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
+++ b/plugins/comment_paragraph/lib/comment_paragraph_plugin.rb
@@ -52,8 +52,8 @@ class CommentParagraphPlugin < Noosfero::Plugin
           paragraph_id = 0
 
           doc = Hpricot(@article.body)
-          paragraphs = doc.search("/[\r\n]").each do |paragraph|
-            parsed_paragraphs << (paragraph.to_html =~ /(.*)paragraph_comment_spacer(.*)|<div(.*)paragraph_comment(.*)/ ? paragraph.to_html : CommentParagraphPlugin.parse_paragraph(paragraph.to_html, paragraph_id))
+          paragraphs = doc.search("/*").each do |paragraph|
+            parsed_paragraphs << (paragraph.to_html =~ /^\n|\r\n|<p>\W<\/p>$|(.*)paragraph_comment_spacer(.*)|<div(.*)paragraph_comment(.*)$/ ? paragraph.to_html : CommentParagraphPlugin.parse_paragraph(paragraph.to_html, paragraph_id))
             paragraph_id += 1
           end
 
@@ -75,7 +75,7 @@ class CommentParagraphPlugin < Noosfero::Plugin
       "<div class='macro article_comments paragraph_comment' " +
            "data-macro='comment_paragraph_plugin/allow_comment' " +
            "data-macro-paragraph_id='#{paragraph_id}'>#{paragraph_content}</div>\r\n" +
-      "<p class='paragraph_comment_spacer'></p>\r\n"
+      "<p class='paragraph_comment_spacer'>&nbsp;</p>\r\n"
   end
 
 end
--
libgit2 0.21.2