diff --git a/layouts/partials/_main.html b/layouts/partials/_main.html
index f2e77b6944..f185599f5c 100644
--- a/layouts/partials/_main.html
+++ b/layouts/partials/_main.html
@@ -3,6 +3,6 @@
 {{- if not .File }}
   {{- partial "output-partial.html" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "initial.html" .))) }}
 {{- else }}
-  {{- partial "output-partial.html" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "content.html" .))) }}
+  {{- partial "output-partial.html" (dict "base" "body" "page" . "parameter" (dict "page" . "content" (partial "output-partial.html" (dict "base" "content" "page" . "parameter" .)))) }}
 {{- end }}
 {{- partial "output-partial.html" (dict "base" "footer" "page" . "parameter" .) }}
\ No newline at end of file
diff --git a/layouts/partials/nested-article.html b/layouts/partials/nested-article.html
index 131d94d4c9..9369f7d3bc 100644
--- a/layouts/partials/nested-article.html
+++ b/layouts/partials/nested-article.html
@@ -92,7 +92,7 @@
   {{- $currentNode := .currentnode }}
   {{- with .sect }}
     {{- $page := . }}
-    {{- $content := partial "content.html" $page }}
+    {{- $content := partial "output-partial.html" (dict "base" "content" "page" . "parameter" $page) }}
     {{- partial "output-partial.html" (dict "base" "output-article" "page" $page "parameter" (dict "page" $page "content" $content)) }}
     {{- $currentNode.Page.Store.Set "nestedHasMathJax" (or ($currentNode.Page.Store.Get "nestedHasMathJax") (.Page.Store.Get "hasMathJax")) }}
     {{- $currentNode.Page.Store.Set "nestedHasMermaid" (or ($currentNode.Page.Store.Get "nestedHasMermaid") (.Page.Store.Get "hasMermaid")) }}