diff --git a/rendercv/themes/classic/ExperienceEntry.j2.tex b/rendercv/themes/classic/ExperienceEntry.j2.tex
index 77df931..c01ee51 100644
--- a/rendercv/themes/classic/ExperienceEntry.j2.tex
+++ b/rendercv/themes/classic/ExperienceEntry.j2.tex
@@ -7,32 +7,32 @@
 \vspace{<<design.margins.entry_area.vertical_between>>}
 ((* endif *))
 
-((* if date_and_location_strings == ["", "", ""] or date_and_location_strings == ["", ""] *))
-\begin{onecolentry}
-    \textbf{<<entry.company>>}, <<entry.position>>
-((* for item in entry.highlights *))
-    ((* if loop.first *))
-    \begin{highlights}
-    ((* endif *))
-        \item <<item>>
-    ((* if loop.last *))
-    \end{highlights}
-    ((* endif *))
-((* endfor *))
-\end{onecolentry}
-((* else *))
+((* if entry.date_string or entry.location *))
 \begin{twocolentry}{
     <<date_and_location_strings|join("\n\n")>>
 }
     \textbf{<<entry.company>>}, <<entry.position>>
-((* for item in entry.highlights *))
-    ((* if loop.first *))
+    ((* for item in entry.highlights *))
+        ((* if loop.first *))
     \begin{highlights}
-    ((* endif *))
+        ((* endif *))
         \item <<item>>
-    ((* if loop.last *))
+        ((* if loop.last *))
     \end{highlights}
-    ((* endif *))
-((* endfor *))
+        ((* endif *))
+    ((* endfor *))
 \end{twocolentry}
+((* else *))
+\begin{onecolentry}
+    \textbf{<<entry.company>>}, <<entry.position>>
+    ((* for item in entry.highlights *))
+        ((* if loop.first *))
+    \begin{highlights}
+        ((* endif *))
+        \item <<item>>
+        ((* if loop.last *))
+    \end{highlights}
+        ((* endif *))
+    ((* endfor *))
+\end{onecolentry}
 ((* endif *))
\ No newline at end of file
diff --git a/rendercv/themes/classic/NormalEntry.j2.tex b/rendercv/themes/classic/NormalEntry.j2.tex
index 1116a79..4e781a9 100644
--- a/rendercv/themes/classic/NormalEntry.j2.tex
+++ b/rendercv/themes/classic/NormalEntry.j2.tex
@@ -7,32 +7,32 @@
 \vspace{<<design.margins.entry_area.vertical_between>>}
 ((* endif *))
 
-((* if date_and_location_strings == ["", "", ""] or date_and_location_strings == ["", ""] *))
-\begin{onecolentry}
-    \textbf{<<entry.name>>}
-((* for item in entry.highlights *))
-    ((* if loop.first *))
-    \begin{highlights}
-    ((* endif *))
-        \item <<item>>
-    ((* if loop.last *))
-    \end{highlights}
-    ((* endif *))
-((* endfor *))
-\end{onecolentry}
-((* else *))
+((* if entry.date_string or entry.location *))
 \begin{twocolentry}{
     <<date_and_location_strings|join("\n\n")>>
 }
     \textbf{<<entry.name>>}
-((* for item in entry.highlights *))
-    ((* if loop.first *))
+    ((* for item in entry.highlights *))
+        ((* if loop.first *))
     \begin{highlights}
-    ((* endif *))
+        ((* endif *))
         \item <<item>>
-    ((* if loop.last *))
+        ((* if loop.last *))
     \end{highlights}
-    ((* endif *))
-((* endfor *))
+        ((* endif *))
+    ((* endfor *))
 \end{twocolentry}
+((* else *))
+\begin{onecolentry}
+    \textbf{<<entry.name>>}
+    ((* for item in entry.highlights *))
+        ((* if loop.first *))
+    \begin{highlights}
+        ((* endif *))
+        \item <<item>>
+        ((* if loop.last *))
+    \end{highlights}
+        ((* endif *))
+    ((* endfor *))
+\end{onecolentry}
 ((* endif *))
\ No newline at end of file