diff --git a/rendercv/themes/classic/TextEntry.j2.tex b/rendercv/themes/classic/TextEntry.j2.tex
index 4c72719..21e8f79 100644
--- a/rendercv/themes/classic/TextEntry.j2.tex
+++ b/rendercv/themes/classic/TextEntry.j2.tex
@@ -1,15 +1,10 @@
 ((* if not is_first_entry *))
 \vspace{<<design.margins.entry_area.vertical_between>>}
 ((* endif *))
-\begin{changemargin}{<<design.margins.entry_area.left_and_right>>}{<<design.margins.entry_area.left_and_right>>}
-((* if design.text_alignment == "left-aligned" *))
-\raggedright
-((* endif *))
+\begingroup((* if design.text_alignment == "left-aligned" *))\raggedright((* endif *))
+\leftskip=<<design.margins.entry_area.left_and_right>>
+\advance\csname @rightskip\endcsname <<design.margins.entry_area.left_and_right>>
+\advance\rightskip <<design.margins.entry_area.left_and_right>>
+
 <<entry>>
-((* if design.text_alignment == "left-aligned" *))
-\par
-((* endif *))
-\end{changemargin}
-
-
-
+\par\endgroup