diff --git a/rendercv/templates/classic/classic.tex.j2 b/rendercv/templates/classic/classic.tex.j2
index 0e4d25d..d092986 100644
--- a/rendercv/templates/classic/classic.tex.j2
+++ b/rendercv/templates/classic/classic.tex.j2
@@ -95,7 +95,7 @@
                 parsep=<<theme_options.margins.highlights_area.vertical_between_bullet_points>>,
                 partopsep=0pt,
                 itemsep=0pt,
-                after=\vspace*{-1\baselineskip},
+                after=\vspace{-1\baselineskip},
                 leftmargin=<<theme_options.margins.highlights_area.left>> + 3pt
             ]
     }{
diff --git a/rendercv/templates/classic/components/highlights.tex.j2 b/rendercv/templates/classic/components/highlights.tex.j2
index 56fb1c6..7bab5d1 100644
--- a/rendercv/templates/classic/components/highlights.tex.j2
+++ b/rendercv/templates/classic/components/highlights.tex.j2
@@ -1,5 +1,5 @@
 ((* macro highlights(highlights) *))
-\vspace*{<<theme_options.margins.highlights_area.top>>}
+\vspace{<<theme_options.margins.highlights_area.top>>}
     ((* for item in highlights *))
         ((* if loop.first *))
 \begin{highlights}
diff --git a/rendercv/templates/classic/components/section_contents.tex.j2 b/rendercv/templates/classic/components/section_contents.tex.j2
index 017d0c5..0af0c85 100644
--- a/rendercv/templates/classic/components/section_contents.tex.j2
+++ b/rendercv/templates/classic/components/section_contents.tex.j2
@@ -7,6 +7,9 @@
         ((* else *))
             ((* set date_and_location_strings = value.date_and_location_strings_without_timespan *))
         ((* endif *))
+        ((* if not loop.first *))
+    \vspace{<<theme_options.margins.entry_area.vertical_between>>}
+        ((* endif *))
         ((* if entry_type == "EducationEntry" *))
     <<entry["education"](
         study_type=value.study_type,
@@ -47,9 +50,5 @@
         doi_url=value.doi_url,
     )|indent(4)>>
         ((* endif *))
-        ((* if not loop.last *))
-    \vspace*{<<theme_options.margins.entry_area.vertical_between>>}
-    
-        ((* endif *))
     ((* endfor *))
 ((* endmacro *))