diff --git a/pdf/src/plugin-resources/fo-body.xslt b/pdf/src/plugin-resources/fo-body.xslt
index 17d61bb5..cd03cf2a 100644
--- a/pdf/src/plugin-resources/fo-body.xslt
+++ b/pdf/src/plugin-resources/fo-body.xslt
@@ -310,15 +310,35 @@
         <xsl:variable name="height">
             <xsl:value-of select="substring-before(concat(normalize-space(@height),'p'),'p') div $imageDpi"/>
         </xsl:variable>
+        <xsl:variable name="realwidth">
+            <xsl:choose>
+                <xsl:when test="normalize-space($width) = 'NaN'">
+                    <xsl:value-of select="'auto'"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$width"/>in
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <xsl:variable name="realheight">
+            <xsl:choose>
+                <xsl:when test="normalize-space($height) = 'NaN'">
+                    <xsl:value-of select="'auto'"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="$height"/>in
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
         <!-- Enclose image in a block if parent is a section or subsection element -->
         <xsl:choose>
             <xsl:when test="parent::section | parent::subsection">
                 <fo:block>
-                    <fo:external-graphic src="{normalize-space($source)}" height="{$height}in" width="{$width}in" content-height="auto" content-width="auto"/>
+                    <fo:external-graphic src="{normalize-space($source)}" height="{$realheight}" width="{$realwidth}" content-height="auto" content-width="auto"/>
                 </fo:block>
             </xsl:when>
             <xsl:otherwise>
-                <fo:external-graphic src="{normalize-space($source)}" height="{$height}in" width="{$width}in" content-height="auto" content-width="auto"/>
+                <fo:external-graphic src="{normalize-space($source)}" height="{$realheight}" width="{$realwidth}" content-height="auto" content-width="auto"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>