diff --git a/src/core/render/compiler.js b/src/core/render/compiler.js
index 41ae3a132..34c64ae72 100644
--- a/src/core/render/compiler.js
+++ b/src/core/render/compiler.js
@@ -265,8 +265,6 @@ export class Compiler {
         result = helperTpl('tip', text)
       } else if (/^\?>/.test(text)) {
         result = helperTpl('warn', text)
-      } else if (/^</.test(text)) {
-        return text
       } else {
         result = `<p>${text}</p>`
       }
diff --git a/src/core/render/index.js b/src/core/render/index.js
index feacd60d2..fae1bc526 100644
--- a/src/core/render/index.js
+++ b/src/core/render/index.js
@@ -179,7 +179,7 @@ export function renderMixin(proto) {
 
     const m = html
       .trim()
-      .match('<img.*?data-origin="(.*?)"[^a]+alt="(.*?)">([^<]*?)$')
+      .match('<p><img.*?data-origin="(.*?)"[^a]+alt="(.*?)">([^<]*?)</p>$')
 
     if (m) {
       if (m[2] === 'color') {
@@ -198,17 +198,6 @@ export function renderMixin(proto) {
       html = html.replace(m[0], '')
     }
 
-    // XXX: A Workaround
-    html = html
-      .split('\n')
-      .map(part => {
-        if (/^<a/.test(part)) {
-          return part.replace('<a', '<a data-button')
-        }
-        return part
-      })
-      .join('\n')
-
     this._renderTo('.cover-main', html)
     sticky()
   }
diff --git a/src/themes/basic/_coverpage.styl b/src/themes/basic/_coverpage.styl
index 600d4510a..001493225 100644
--- a/src/themes/basic/_coverpage.styl
+++ b/src/themes/basic/_coverpage.styl
@@ -61,7 +61,7 @@ section.cover
     max-width 500px
     padding 0
 
-  .cover-main > a[data-button]
+  .cover-main > p:last-child a
     border-color var(--theme-color, $color-primary)
     border-radius 2rem
     border-style solid