diff --git a/draft/application/cms/src/kernel/content/format/filters/cms_html_filter.e b/draft/application/cms/src/kernel/content/format/filters/cms_html_filter.e
index 6c8b2b9f..bc35b4eb 100644
--- a/draft/application/cms/src/kernel/content/format/filters/cms_html_filter.e
+++ b/draft/application/cms/src/kernel/content/format/filters/cms_html_filter.e
@@ -45,6 +45,7 @@ feature -- Conversion
 			i: INTEGER
 			n: INTEGER
 			in_tag: BOOLEAN
+			t: READABLE_STRING_8
 			p1, p2: INTEGER
 		do
 			create l_new.make (a_text.count)
@@ -75,7 +76,9 @@ feature -- Conversion
 						else
 							i := a_text.index_of ('<', p2 + 1)
 						end
-						if i > 0 then
+						if i = 0 then
+							p1 := p2 + 1
+						else
 							l_new.append (a_text.substring (p2 + 1, i - 1))
 						end
 					end