diff --git a/build.gradle b/build.gradle
index cddc92045..374de51d2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,6 +100,8 @@ project(':iso20022-core') {
testImplementation group: 'org.xmlunit', name: 'xmlunit-assertj', version: '2.8.3'
testImplementation project(':model-acmt-mx')
testImplementation project(':model-acmt-types')
+ testImplementation project(':model-admi-mx')
+ testImplementation project(':model-admi-types')
testImplementation project(':model-camt-mx')
testImplementation project(':model-camt-types')
testImplementation project(':model-catm-mx')
diff --git a/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue39.java b/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue39.java
new file mode 100644
index 000000000..53dd45edc
--- /dev/null
+++ b/iso20022-core/src/test/java/com/prowidesoftware/issues/Issue39.java
@@ -0,0 +1,109 @@
+package com.prowidesoftware.issues;
+
+import com.prowidesoftware.swift.model.mx.MxAdmi00700101;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+/**
+ * https://github.com/prowide/prowide-iso20022/issues/39
+ */
+public class Issue39 {
+
+ private String xmlWithSplmtryData = "\n" +
+ "\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " XXXXXXXXXXX\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " XXXXXXXXXXX\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " XXXXXXX\n" +
+ " admi.007.001.01\n" +
+ " 2022-01-11T15:02:09Z\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " XXXXXXX\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " [XXXXXX]\n" +
+ " \n" +
+ " \n" +
+ " ACKT\n" +
+ " CR50\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ // this is Any (lax)
+ " TOTO\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ "";
+
+ private String xmlWithoutSplmtryData = "\n" +
+ "\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " XXXXXXXXXXX\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " XXXXXXXXXXX\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " XXXXXXX\n" +
+ " admi.007.001.01\n" +
+ " 2022-01-11T15:02:09Z\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " XXXXXXX\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " [XXXXXX]\n" +
+ " \n" +
+ " \n" +
+ " ACKT\n" +
+ " CR50\n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ "";
+
+ @Test
+ public void testParseWithSplmtryData() {
+ MxAdmi00700101 mx = MxAdmi00700101.parse(xmlWithSplmtryData);
+ assertNotNull(mx);
+ }
+
+ @Test
+ public void testParseWithoutSplmtryData() {
+ MxAdmi00700101 mx = MxAdmi00700101.parse(xmlWithoutSplmtryData);
+ assertNotNull(mx);
+ }
+
+}