diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
new file mode 100644
index 0000000..f27522f
--- /dev/null
+++ b/layouts/_default/_markup/render-heading.html
@@ -0,0 +1 @@
+<a href="#{{ .Anchor | safeURL }}" class="heading-anchor"><h{{ .Level }} id="{{ .Anchor | safeURL }}">{{ .Text | safeHTML }}</h{{ .Level}}></h></a>
\ No newline at end of file
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 3befec0..cd88f56 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -9,9 +9,7 @@
   </p>
   <div class="tag-container">
   </div>
-  {{- with .Content -}}
-    {{ . | replaceRE "(<h[1-2] id=\"([^\"]+)\".+)(</h[1-9]+>)" `<a href="#${2}" class="heading-anchor" ariaLabel="Anchor"> ${1}</a> ${3}` | safeHTML }}
-  {{- end -}}
+  {{ .Content }}
 </div>
 
 {{ if and .Site.Params.CommentoURL (and (not .Site.BuildDrafts) (not .Site.IsServer)) -}}