2 files changed, 11 insertions, 12 deletions
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
index 87ab4275f..f326ccfe9 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
@@ -251,10 +251,9 @@ public final class Linker implements Serializable {
 		originalAssertions = new ArrayList<STORKAttrQueryResponse>();
 
 		// Gather all assertions
-		for (STORKAttrQueryResponse element : this.assertions.values()) {
-			originalAssertions.add(element);
+		for (List<STORKAttrQueryResponse> element : this.assertions.values()) {
+			originalAssertions.addAll(element);
 		}
-
 		return originalAssertions;
 	}
 
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
index 82ec6d3b4..c656f81ee 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
@@ -376,15 +376,6 @@ public class ObjectFactory {
 	}
 
 	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
-	public JAXBElement<MandateType> createMandate(MandateType value) {
-		return new JAXBElement<MandateType>(_Mandate_QNAME, MandateType.class, null, value);
-	}
-
-	/**
 	 * Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >}
 	 * 
 	 */
@@ -394,6 +385,15 @@ public class ObjectFactory {
 	}
 
 	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}
+	 *
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
+	public JAXBElement<MandateType> createMandate(MandateType value) {
+		return new JAXBElement<MandateType>(_Mandate_QNAME, MandateType.class, null, value);
+	}
+
+	/**
 	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
 	 * 
 	 */