--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java	Wed Oct 19 15:32:22 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java	Wed Oct 19 16:04:40 2011 +0000
@@ -58,11 +58,12 @@
 
     public static final String XPATH_OUT_TYPE = "/art:action/@art:type";
 
+    public static final String XPATH_MASTER_UUID = "/art:artifact-collection/art:artifact/@art:uuid";
+
     public static final String XPATH_LOADED_RECOMMENDATIONS =
         "/art:attribute/art:loaded-recommendations";
 
 
-
     /**
      * Return description Document for this collection.
      */
@@ -217,7 +218,23 @@
 
         generator.init(format, out, context);
 
-        // TODO Determine the correct master artifact here!
+        // Get master artifact.
+        try{
+            ArtifactDatabase db = context.getDatabase();
+            CallMeta callMeta   = context.getMeta();
+            Document document = 
+            db.getCollectionsMasterArtifact(identifier(), callMeta);
+
+            //log.debug(XMLUtils.toString(document));
+
+            String masterUUID = XMLUtils.xpathString(
+            document, XPATH_MASTER_UUID, ArtifactNamespaceContext.INSTANCE);
+
+            log.error("Will set master Artifact to uuid: " + masterUUID);
+            generator.setMasterArtifact(getArtifact(masterUUID, context));
+        } catch (ArtifactDatabaseException adb) {
+            log.error(adb, adb);
+        }
 
         try {
             Document attr = getAttribute(context, name);
@@ -277,9 +294,6 @@
                 }
 
                 Artifact artifact = getArtifact(art, context);
-                if (i == 0) {
-                    generator.setMasterArtifact(artifact);
-                }
 
                 generator.doOut(
                     artifact,