diff --git a/xslt/divelogs-export.xslt b/xslt/divelogs-export.xslt
index b13006d3b..50224280f 100644
--- a/xslt/divelogs-export.xslt
+++ b/xslt/divelogs-export.xslt
@@ -88,7 +88,7 @@
           <xsl:value-of select="node()/sample[@pressure][last()]/@pressure"/>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:value-of select="cylinder[$cylinder]/@end"/>
+          <xsl:value-of select="cylinder[position() = $cylinder]/@end"/>
         </xsl:otherwise>
       </xsl:choose>
     </CYLINDERENDPRESSURE>
@@ -99,7 +99,7 @@
       </xsl:call-template>
     </WEIGHT>
     <O2PCT>
-      <xsl:value-of select="substring-before(cylinder/@o2, '%')"/>
+      <xsl:value-of select="substring-before(cylinder[position() = $cylinder]/@o2, '%')"/>
     </O2PCT>
     <LOGNOTES>
       <xsl:value-of select="notes"/>