diff --git a/format-master.xml b/format-master.xml
index 8cfd123..c6b66ae 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -1739,8 +1739,8 @@
 							<xsl:text>-96dpi</xsl:text>
 						</xsl:when>
 						<!-- Allow the author to specify a non-standard image location on the fly. -->
-						<xsl:when test="count(location) != 0">
-							<xsl:value-of select="location"/>
+						<xsl:when test="@location">
+							<xsl:value-of select="@location"/>
 							<xsl:text>/</xsl:text>
 							<xsl:value-of select="basename|@basename"/>
 						</xsl:when>
@@ -1795,8 +1795,8 @@
 								<xsl:text>-96dpi</xsl:text>
 							</xsl:when>
 							<!-- Allow the author to specify a non-standard image location on the fly. -->
-							<xsl:when test="count(location) != 0">
-								<xsl:value-of select="location"/>
+							<xsl:when test="@location">
+								<xsl:value-of select="@location"/>
 								<xsl:text>/</xsl:text>
 								<xsl:value-of select="basename|@basename"/>
 							</xsl:when>