diff --git a/xslt/divelogs-export.xslt b/xslt/divelogs-export.xslt
index 79f72b5fd..5752a4452 100644
--- a/xslt/divelogs-export.xslt
+++ b/xslt/divelogs-export.xslt
@@ -119,7 +119,7 @@
             </xsl:otherwise>
           </xsl:choose>
         </xsl:variable>
-        <xsl:if test="following-sibling::divecomputer/event[@name='gaschange' and @value=$gas]">
+        <xsl:if test="following-sibling::divecomputer/event[@name='gaschange' and @value=$gas] or substring-before(@start, ' ') - 5 &gt; substring-before(@end, ' ')">
           <xsl:variable name="cur_cyl">
             <xsl:value-of select="position()"/>
           </xsl:variable>