diff --git a/layouts/partials/pic_set.html b/layouts/partials/pic_set.html
index 7a39b01..ad8aedd 100644
--- a/layouts/partials/pic_set.html
+++ b/layouts/partials/pic_set.html
@@ -5,6 +5,8 @@
     {{ $max_width = 53}}
 {{ end }}
 
+{{ $caption := .caption}}
+
 <div class="pic-grid" style="width: {{ $max_width }}%">
     <div class="pure-g">
         {{ range $num, $a := .pic_set }}
diff --git a/layouts/partials/row.html b/layouts/partials/row.html
index 5723031..f49d3e5 100644
--- a/layouts/partials/row.html
+++ b/layouts/partials/row.html
@@ -61,7 +61,8 @@
                     
                     {{/* add-on info 1: pictures */}}
                     {{/* new pictures API `pictures` (combine single & multiple pictures)*/}}
-                    {{ $pictures_set:= slice}}
+                    {{ $pictures_set := slice}}
+                    {{ $picture_caption := .Plain}}
                     {{ with .Params.pictures }}
                         {{ range . }}
                             {{ with . }}
@@ -72,25 +73,20 @@
 
                     {{ if (eq (len $pictures_set) 1) }}
                         {{ range $pictures_set }}
-                            <img src="{{ . }}" class="single-pic" alt="Responsive image" data-fancybox="gallery"></img>
+                            <img src="{{ . }}" class="single-pic" alt="Responsive image" data-fancybox="gallery" data-caption={{ $picture_caption }}></img>
                         {{ end }}
                     {{ end }}
 
-                    {{ $test := "test" }}
                     {{ if (gt (len $pictures_set) 1)}}
-                        {{/* partial "pic_set.html" (dict "pic_set" $pictures_set "other" $.Site.BaseURL) */}}
-                        {{ partial "pic_set.html" (dict "pic_set" $pictures_set "other" $.Site.BaseURL) }}
-                        {{ $test }}
-                        {{ partial "pic_set.html" (dict "pic_set" $pictures_set "other" $.Site.BaseURL) }}
-                        {{/* partial "pic_set.html" $pictures_set "other" */}}
+                        {{ partial "pic_set.html" (dict "pic_set" $pictures_set "other" $.Site.BaseURL "caption" $picture_caption) }}
                     {{ end }}
 
                     {{/* Probably DEPRECATED in the future: single picture (old version API `pic`)*/}}
                     {{ with .Params.pic }}
-                        <img src="{{ . }}" class="single-pic" alt="Responsive image" data-fancybox="gallery"></img>
+                        <img src="{{ . }}" class="single-pic" alt="Responsive image" data-fancybox="gallery" data-caption={{ $picture_caption }}></img>
                     {{ end }}
 
-                    {{/* Probably DEPRECATED: multiple pictures (old version API `pic_set`) */}}
+                    {{/* Probably DEPRECATED in the future: multiple pictures (old version API `pic_set`) */}}
                     {{ $pic_set_filtered := slice}}
                     {{ with .Params.pic_set }}
                         {{ range . }}
@@ -101,7 +97,7 @@
                     {{ end }}
 
                     {{ with $pic_set_filtered }}
-                        {{ partial "pic_set.html" (dict "pic_set" .) }}
+                        {{ partial "pic_set.html" (dict "pic_set" . "caption" $picture_caption) }}
                     {{ end }}