diff --git a/rendercv/themes/mcdowell/Preamble.j2.tex b/rendercv/themes/mcdowell/Preamble.j2.tex
index 315b1dd..8732335 100644
--- a/rendercv/themes/mcdowell/Preamble.j2.tex
+++ b/rendercv/themes/mcdowell/Preamble.j2.tex
@@ -40,5 +40,5 @@
 
 % Set applicant's personal data for header
 \name{<<cv.name>>}
-\address{<<cv.location|default("")>>}
-\contacts{((* if cv.phone *))<<cv.phone|replace("tel:", "")|replace("-"," ")>> \linebreak((* endif *)) <<cv.email|default("")>>}
\ No newline at end of file
+\address{<<cv.location if cv.location is not none>>}
+\contacts{((* if cv.phone *))<<cv.phone|replace("tel:", "")|replace("-"," ")>> \linebreak((* endif *)) <<cv.email if cv.email is not none>>}
\ No newline at end of file