diff --git a/.hgtags b/.hgtags
index 0ae61e3922368643e0efd074d03503351a0aaf4f_LmhndGFncw==..1b0122534dad6216d8d1622d9c9a5dd1cd0482b8_LmhndGFncw== 100644
--- a/.hgtags
+++ b/.hgtags
@@ -27,3 +27,5 @@
 5bd7643387325cf0c080ba22fba28e72dca5e07d cubicweb-comment-debian-version-1.8.0-1
 a6f4c93f4fb79a4279e33bef4bda001544cd472c cubicweb-comment-version-1.8.1
 a0d092900c13464389c0d45ea500dc1b5f4f3319 cubicweb-comment-debian-version-1.8.1-1
+cea1da0b8408ebc4318913d69b80a24dffa34238 cubicweb-comment-version-1.8.2
+e0a739b16cc8c515fe68cbe8b01273ab0bcb33fa cubicweb-comment-debian-version-1.8.2-1
diff --git a/__pkginfo__.py b/__pkginfo__.py
index 0ae61e3922368643e0efd074d03503351a0aaf4f_X19wa2dpbmZvX18ucHk=..1b0122534dad6216d8d1622d9c9a5dd1cd0482b8_X19wa2dpbmZvX18ucHk= 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -4,7 +4,7 @@
 modname = 'comment'
 distname = "cubicweb-%s" % modname
 
-numversion = (1, 8, 1)
+numversion = (1, 8, 2)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL'
diff --git a/debian/changelog b/debian/changelog
index 0ae61e3922368643e0efd074d03503351a0aaf4f_ZGViaWFuL2NoYW5nZWxvZw==..1b0122534dad6216d8d1622d9c9a5dd1cd0482b8_ZGViaWFuL2NoYW5nZWxvZw== 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cubicweb-comment (1.8.2-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Tue, 04 Oct 2011 11:13:32 +0200
+
 cubicweb-comment (1.8.1-1) unstable; urgency=low
 
   * new upstream release
diff --git a/entities.py b/entities.py
index 0ae61e3922368643e0efd074d03503351a0aaf4f_ZW50aXRpZXMucHk=..1b0122534dad6216d8d1622d9c9a5dd1cd0482b8_ZW50aXRpZXMucHk= 100644
--- a/entities.py
+++ b/entities.py
@@ -84,7 +84,7 @@
                                            {'x': ceid}, build_descr=True).get_entity(0, 0)
             except TypeResolverException:
                 # not a comment
-                break
+                continue
             strings.append(comment.view('fulltext', indentlevel=indentlevel-i,
                                         withauthor=i!=indentlevel).strip() + '\n')
         strings.append(u'\n%s: %s' % (self._cw._('i18n_by_author_field'),