diff --git a/_layouts/page.html b/_layouts/page.html
index 1493761e..e494fada 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -1,6 +1,7 @@
 ---
 layout: default
 ---
+{% assign processed_content = content | replace: '<p><a id="', '<a id="' | replace: '"></a></p>', '"></a>' %}
 
 <div class="post-header">
    <h1 class="post-title-main">{{ page.title }}</h1>
@@ -35,10 +36,11 @@ <h1 class="post-title-main">{{ page.title }}</h1>
     {% endunless %}
 
    <p>{{page.summary}}</p>
-   {{content}}
+   {{ processed_content }}
 
 {% include commento.html %}
-   
+
 {% include in_page_toc.html %}
 
 </div>
+
diff --git a/_layouts/page_print.html b/_layouts/page_print.html
index 1f6ba038..462fca8c 100644
--- a/_layouts/page_print.html
+++ b/_layouts/page_print.html
@@ -2,9 +2,11 @@
 layout: default_print
 comments: true
 ---
+{% assign processed_content = content | replace: '<p><a id="', '<a id="' | replace: '"></a></p>', '"></a>' %}
+
 <div class="post-header">
     {% assign sidebar = site.data.sidebars[page.sidebar].entries %}
-    
+
     {% for entry in sidebar %}
       {% for folder in entry.folders %}
         {% if folder.title and folder.type != "navi" and folder.type != "frontmatter" %}
@@ -22,5 +24,6 @@ <h1 class="post-title-main" id="{{page.permalink | replace: '/', '' }}">{{ folde
 </div>
 
 <div class="post-content">
-  {{ content }}
+  {{ processed_content }}
 </div>
+