diff --git a/xslt/uddf.xslt b/xslt/uddf.xslt
index f9872b7bd..0604b2246 100644
--- a/xslt/uddf.xslt
+++ b/xslt/uddf.xslt
@@ -247,13 +247,6 @@
         </xsl:if>
       </temperature>
 
-
-      <divecomputer deviceid="ffffffff">
-        <xsl:attribute name="model">
-          <xsl:value-of select="/uddf/generator/name|/u:uddf/u:generator/u:name|/u1:uddf/u1:generator/u1:name|/UDDF/history/modified/application/name"/>
-        </xsl:attribute>
-      </divecomputer>
-
       <xsl:if test="equipment_used/tank_used != ''">
         <xsl:for-each select="equipment_used/tank_used">
           <cylinder>
@@ -318,6 +311,12 @@
         </cylinder>
       </xsl:for-each>
 
+
+      <divecomputer deviceid="ffffffff">
+        <xsl:attribute name="model">
+          <xsl:value-of select="/uddf/generator/name|/u:uddf/u:generator/u:name|/u1:uddf/u1:generator/u1:name|/UDDF/history/modified/application/name"/>
+        </xsl:attribute>
+
       <depth>
         <xsl:for-each select="greatestdepth|informationafterdive/greatestdepth|u:greatestdepth|u:informationafterdive/u:greatestdepth|u1:greatestdepth|u1:informationafterdive/u1:greatestdepth|max_depth">
           <xsl:attribute name="max">
@@ -542,6 +541,7 @@
           </xsl:if>
         </sample>
       </xsl:for-each>
+      </divecomputer>
     </dive>
   </xsl:template>