diff --git a/rendercv/themes/sb2nov/NormalEntry.j2.tex b/rendercv/themes/sb2nov/NormalEntry.j2.tex
index 66d29d7..829d5a4 100644
--- a/rendercv/themes/sb2nov/NormalEntry.j2.tex
+++ b/rendercv/themes/sb2nov/NormalEntry.j2.tex
@@ -1,5 +1,5 @@
 \resumeNormalSubheading
-    {<<entry.name>>}{((* if entry.date_string == "" *))<<entry.location>>((* else *))<<entry.date_string>>((* endif *))}
+    {<<entry.name>>}{<<entry.location>>((* if entry.date_string and entry.location *)), ((* endif *))<<entry.date_string>>}
 ((* for item in entry.highlights *))
     ((* if loop.first *))
     \resumeItemListStart