diff --git a/README.md b/README.md
index d1d6507..c3a55bc 100644
--- a/README.md
+++ b/README.md
@@ -106,16 +106,15 @@ struct MyHtmlHandler(DefaultHtmlHandler);
 impl HtmlHandler<MyError> for MyHtmlHandler {
     fn start<W: Write>(&mut self, mut w: W, element: &Element<'_>) -> Result<(), MyError> {
         match element {
-            Element::Headline(headline) => {
-                if headline.level > 6 {
+            Element::Title(title) => {
+                if title.level > 6 {
                     return Err(MyError::Heading);
                 } else {
                     write!(
                         w,
-                        "<h{0}><a id=\"{1}\" href=\"#{1}\">{2}</a></h{0}>",
-                        headline.level,
-                        slugify!(headline.title),
-                        Escape(headline.title),
+                        "<h{0}><a id=\"{1}\" href=\"#{1}\">",
+                        title.level,
+                        slugify!(title.raw),
                     )?;
                 }
             }
@@ -124,6 +123,16 @@ impl HtmlHandler<MyError> for MyHtmlHandler {
         }
         Ok(())
     }
+
+    fn end<W: Write>(&mut self, mut w: W, element: &Element<'_>) -> Result<(), MyError> {
+        match element {
+            Element::Title(title) => {
+                write!(w, "</a></h{}>", title.level,)?;
+            }
+            _ => self.0.end(w, element)?,
+        }
+        Ok(())
+    }
 }
 
 fn main() -> Result<(), MyError> {