diff --git a/layouts/shortcodes/figures/image.html b/layouts/shortcodes/figures/image.html
index 056ca50..50cb620 100644
--- a/layouts/shortcodes/figures/image.html
+++ b/layouts/shortcodes/figures/image.html
@@ -1,7 +1,5 @@
 {{- $imgs := slice -}}
-{{- $class := .Get "class" -}}
 {{- $shouldResize := .Get "shouldResize" | default true -}}
-{{- $shouldShowTitle := (.Get "shouldShowTitle") | default true -}}
 
 {{- if .Get "name" -}}
   {{- $imgs = $imgs | append (.Page.Resources.GetMatch (.Get "name")) -}}
@@ -17,6 +15,8 @@
   {{ errorf "No images found for name(s) parameter" }}
 {{- end -}}
 
+{{- $class := .Get "class" -}}
+{{- $shouldShowTitle := (.Get "shouldShowTitle") | default true -}}
 {{- $size := .Get "size" | default "full" -}}
 
 {{ if in (slice "full" "main") $size }}
@@ -25,7 +25,8 @@
       "page" $.Page
       "name" (.Get "name")
       "size" $size
-      "shouldShowTitle" (.Get "shouldShowTitle" | default true)
+      "class" $class
+      "shouldShowTitle" $shouldShowTitle
     )
   }}
 {{ else if eq $size "small" }}
@@ -34,7 +35,8 @@
       "page" $.Page
       "name" (.Get "name")
       "size" $size
-      "shouldShowTitle" (.Get "shouldShowTitle" | default true)
+      "class" $class
+      "shouldShowTitle" $shouldShowTitle
     )
   }}
 {{ end }}