diff --git a/rendercv/templates/components/classic/highlights.tex.j2 b/rendercv/templates/components/classic/highlights.tex.j2
index 8e10897..122ecdf 100644
--- a/rendercv/templates/components/classic/highlights.tex.j2
+++ b/rendercv/templates/components/classic/highlights.tex.j2
@@ -1,8 +1,12 @@
 ((* macro highlights(highlights) *))
 \vspace*{<<design.margins.highlights_area.top>>}
+    ((* for item in highlights *))
+        ((* if loop.first *))
 \begin{highlights}
-((* for item in highlights *))
+        ((* endif *))
     \item <<item|markdown_to_latex>>
-((* endfor *))
+        ((* if loop.last *))
 \end{highlights}
+        ((* endif *))
+((* endfor *))
 ((* endmacro *))
\ No newline at end of file