diff --git a/src/Components/Blocks/Markup.php b/src/Components/Blocks/Markup.php
index 6d5a471..95a373d 100644
--- a/src/Components/Blocks/Markup.php
+++ b/src/Components/Blocks/Markup.php
@@ -82,7 +82,7 @@ final class Markup implements ContinuableBlock
             return new self($rawLine, 5, self::closes12345TypeMarkup(5, $text));
         }
 
-        if (\preg_match('/^<[\/]?+(\w*)(?:[ ]*+'.self::REGEX_HTML_ATTRIBUTE.')*+[ ]*+(\/)?>/', $text, $matches)) {
+        if (\preg_match('/^<[\/]?+(\w++)(?:[ ]*+'.self::REGEX_HTML_ATTRIBUTE.')*+[ ]*+(\/)?>/', $text, $matches)) {
             $element = \strtolower($matches[1]);
 
             if (\array_key_exists($element, Element::$TEXT_LEVEL_ELEMENTS)) {
diff --git a/tests/commonmark/587-Autolinks.html b/tests/commonmark/587-Autolinks.html
new file mode 100644
index 0000000..6f5b8bb
--- /dev/null
+++ b/tests/commonmark/587-Autolinks.html
@@ -0,0 +1 @@
+<p>&lt;&gt;</p>
\ No newline at end of file
diff --git a/tests/commonmark/587-Autolinks.md b/tests/commonmark/587-Autolinks.md
new file mode 100644
index 0000000..6787e48
--- /dev/null
+++ b/tests/commonmark/587-Autolinks.md
@@ -0,0 +1 @@
+<>
\ No newline at end of file
diff --git a/tests/commonmark/590-Autolinks.html b/tests/commonmark/590-Autolinks.html
new file mode 100644
index 0000000..2ee3b03
--- /dev/null
+++ b/tests/commonmark/590-Autolinks.html
@@ -0,0 +1 @@
+<p>&lt;foo.bar.baz&gt;</p>
\ No newline at end of file
diff --git a/tests/commonmark/590-Autolinks.md b/tests/commonmark/590-Autolinks.md
new file mode 100644
index 0000000..98a468e
--- /dev/null
+++ b/tests/commonmark/590-Autolinks.md
@@ -0,0 +1 @@
+<foo.bar.baz>
\ No newline at end of file
diff --git a/tests/commonmark/601-Raw_HTML.html b/tests/commonmark/601-Raw_HTML.html
index 2b13be5..ee6e9d1 100644
--- a/tests/commonmark/601-Raw_HTML.html
+++ b/tests/commonmark/601-Raw_HTML.html
@@ -1 +1,4 @@
-<p>foo <a href="\*"></p>
\ No newline at end of file
+<p>&lt; a&gt;&lt;
+foo&gt;&lt;bar/ &gt;
+&lt;foo bar=baz
+bim!bop /&gt;</p>
\ No newline at end of file
diff --git a/tests/commonmark/601-Raw_HTML.md b/tests/commonmark/601-Raw_HTML.md
index b75cefc..97779fe 100644
--- a/tests/commonmark/601-Raw_HTML.md
+++ b/tests/commonmark/601-Raw_HTML.md
@@ -1 +1,4 @@
-foo <a href="\*">
\ No newline at end of file
+< a><
+foo><bar/ >
+<foo bar=baz
+bim!bop />
\ No newline at end of file