diff --git a/layouts/partials/output-partial.hugo b/layouts/partials/output-partial.hugo
index 9e5f687683..d8e276eabd 100644
--- a/layouts/partials/output-partial.hugo
+++ b/layouts/partials/output-partial.hugo
@@ -1,14 +1,14 @@
 {{- $base := .base }}
 {{- $page := .page }}
 {{- $parameter := .parameter }}
-{{- $format := partial "output-format.hugo" $page }}
-{{- $suffix := partial "output-suffix.hugo" $page }}
-{{- $f := printf "/layouts/partials/%s.%s.%s" $base $format $suffix }}
-{{- if or (not $format) (not (partialCached "fileExists.hugo" $f $f)) }}
+{{- $outputFormat := partial "output-format.hugo" $page }}
+{{- $suffix := partialCached "output-suffix.hugo" $page $page $outputFormat }}
+{{- $f := printf "/layouts/partials/%s.%s.%s" $base $outputFormat $suffix }}
+{{- if or (not $outputFormat) (not (partialCached "fileExists.hugo" $f $f)) }}
   {{- $f = printf "/layouts/partials/%s.%s" $base $suffix }}
   {{- if partialCached "fileExists.hugo" $f $f }}
     {{- partial (printf "%s.%s" $base $suffix) $parameter }}
   {{- end }}
 {{- else }}
-  {{- partial (printf "%s.%s.%s" $base $format $suffix) $parameter }}
+  {{- partial (printf "%s.%s.%s" $base $outputFormat $suffix) $parameter }}
 {{- end }}
\ No newline at end of file