diff --git a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs
index 2c22a5339..82abd11c7 100644
--- a/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs
+++ b/src/Java.Interop.Tools.JavaSource/Java.Interop.Tools.JavaSource/SourceJavadocToXmldocGrammar.HtmlBnfTerms.cs
@@ -66,7 +66,7 @@ internal void CreateRules (SourceJavadocToXmldocGrammar grammar)
 				var fontstyle_i     = CreateHtmlToCrefElement (grammar, "i",    "i", InlineDeclarations, optionalEnd: true);
 
 				var preText = new PreBlockDeclarationBodyTerminal ();
-				PreBlockDeclaration.Rule = CreateStartElementIgnoreAttribute ("pre") + preText + CreateEndElement ("pre", grammar, optional: true);
+				PreBlockDeclaration.Rule = CreateStartElement ("pre") + preText + CreateEndElement ("pre", grammar, optional: true);
 				PreBlockDeclaration.AstConfig.NodeCreator = (context, parseNode) => {
 					if (!grammar.ShouldImport (ImportJavadoc.Remarks)) {
 						parseNode.AstNode   = "";
@@ -82,7 +82,7 @@ internal void CreateRules (SourceJavadocToXmldocGrammar grammar)
 				FontStyleDeclaration.Rule = fontstyle_tt | fontstyle_i;
 
 				PBlockDeclaration.Rule =
-					CreateStartElement ("p", grammar) + InlineDeclarations + CreateEndElement ("p", grammar, optional:true)
+					CreateStartElement ("p") + InlineDeclarations + CreateEndElement ("p", grammar, optional:true)
 					;
 				PBlockDeclaration.AstConfig.NodeCreator = (context, parseNode) => {
 					var remarks     = FinishParse (context, parseNode).Remarks;
@@ -260,7 +260,7 @@ static string GetChildNodesAsString (ParseTreeNode parseNode)
 
 			static NonTerminal CreateHtmlToCrefElement (Grammar grammar, string htmlElement, string crefElement, BnfTerm body, bool optionalEnd = false)
 			{
-				var start       = CreateStartElement (htmlElement, grammar);
+				var start       = CreateStartElement (htmlElement);
 				var end         = CreateEndElement (htmlElement, grammar, optionalEnd);
 				var nonTerminal = new NonTerminal ("<" + htmlElement + ">", ConcatChildNodes) {
 					Rule = start + body + end,
@@ -275,28 +275,15 @@ static NonTerminal CreateHtmlToCrefElement (Grammar grammar, string htmlElement,
 				return nonTerminal;
 			}
 
-			static NonTerminal CreateStartElement (string startElement, Grammar grammar)
+			static RegexBasedTerminal CreateStartElement (string startElement, string attribute = "")
 			{
-				var start   = new NonTerminal ("<" + startElement + ">", nodeCreator: (context, parseNode) => parseNode.AstNode = "") {
-					Rule    = grammar.ToTerm ("<" + startElement + ">") | "<" + startElement.ToUpperInvariant () + ">",
-				};
-				return start;
-			}
-
-			static RegexBasedTerminal CreateStartElementIgnoreAttribute (string startElement, string attribute)
-			{
-				return new RegexBasedTerminal ($"<{startElement} {attribute}", $@"(?i)<{startElement}\s*{attribute}[^>]*>") {
+				return new RegexBasedTerminal ($"<{startElement} {attribute}>", $@"(?i)<\b{startElement}\b\s*{attribute}[^>]*>") {
 					AstConfig = new AstNodeConfig {
 						NodeCreator = (context, parseNode) => parseNode.AstNode = "",
 					},
 				};
 			}
 
-			static RegexBasedTerminal CreateStartElementIgnoreAttribute (string startElement)
-			{
-				return CreateStartElementIgnoreAttribute (startElement, "");
-			}
-
 			static NonTerminal CreateEndElement (string endElement, Grammar grammar, bool optional = false)
 			{
 				var end	    = new NonTerminal (endElement, nodeCreator: (context, parseNode) => parseNode.AstNode = "") {
diff --git a/tests/Java.Interop.Tools.JavaSource-Tests/SourceJavadocToXmldocGrammar.HtmlBnfTermsTests.cs b/tests/Java.Interop.Tools.JavaSource-Tests/SourceJavadocToXmldocGrammar.HtmlBnfTermsTests.cs
index fb74b4845..5f5061f2d 100644
--- a/tests/Java.Interop.Tools.JavaSource-Tests/SourceJavadocToXmldocGrammar.HtmlBnfTermsTests.cs
+++ b/tests/Java.Interop.Tools.JavaSource-Tests/SourceJavadocToXmldocGrammar.HtmlBnfTermsTests.cs
@@ -34,6 +34,10 @@ public void PBlockDeclaration ()
 			r = p.Parse("<p>r= <em>unknown</em> text");
 			Assert.IsFalse (r.HasErrors (), DumpMessages (r, p));
 			Assert.AreEqual ("<para>r= &lt;em&gt;unknown&lt;/em&gt; text</para>", r.Root.AstNode.ToString ());
+
+			r = p.Parse ("<p>For <li>A <i id=\"deviceowner\">Device Owner</i>");
+			Assert.IsFalse (r.HasErrors (), DumpMessages (r, p));
+			Assert.AreEqual ("<para>For &lt;li&gt;A <i>Device Owner</i></para>", r.Root.AstNode.ToString ());
 		}
 
 		[Test]