diff --git a/layouts/shortcodes/schedule.html b/layouts/shortcodes/schedule.html
index a1539c2..53f913e 100644
--- a/layouts/shortcodes/schedule.html
+++ b/layouts/shortcodes/schedule.html
@@ -9,10 +9,12 @@
 {{ $rooms := dict }}
 {{ range $day := .conference.days }}
 	{{ range $room := $data.schedule.conference.rooms }}
-		{{ if index $rooms $room.name }}
-			{{ $rooms = merge $rooms (dict $room.name ((index $rooms $room.name) | append (index $day.rooms .name))) }}
-		{{ else }}
-			{{ $rooms = merge $rooms (dict $room.name (index $day.rooms .name)) }}
+		{{ with index $day.rooms $room.name }}
+			{{ if index $rooms $room.name }}
+				{{ $rooms = merge $rooms (dict $room.name ((index $rooms $room.name) | append .)) }}
+			{{ else }}
+				{{ $rooms = merge $rooms (dict $room.name .) }}
+			{{ end }}
 		{{ end }}
 	{{ end }}
 {{ end }}