diff --git a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn
index e9ab5da14b41eb51b0c4082f52162cbfadea62f5..33b2d499f23fb3dd522b9ea216a57cbdf8e2bcc4 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_list_simpletype_e.ttcn
@@ -128,6 +128,25 @@ with {
 };
 
 
+type union MyType
+{
+  XSD.Boolean alt_,
+  record of XSD.Integer alt_1,
+  record of XSD.Float alt_2
+}
+with {
+  variant "useUnion";
+  variant "element";
+  variant (alt_) "name as ''";
+  //variant (alt_) "text 'true' as '1'";
+  //variant (alt_) "text 'false' as '0'";
+  variant (alt_1) "list";
+  variant (alt_1) "name as ''";
+  variant (alt_2) "list";
+  variant (alt_2) "name as ''";
+};
+
+
 }
 with {
   encode "XML";
diff --git a/regression_test/XML/XmlWorkflow/xsd/list_simpletype.xsd b/regression_test/XML/XmlWorkflow/xsd/list_simpletype.xsd
index b67ea6c123e91b4233a2fbffcdd2bca5665cb34a..b60d06c40ad549ea9911b6e2974641ad655644d6 100644
--- a/regression_test/XML/XmlWorkflow/xsd/list_simpletype.xsd
+++ b/regression_test/XML/XmlWorkflow/xsd/list_simpletype.xsd
@@ -111,6 +111,22 @@
 	</xsd:simpleType>
 </xsd:element>
 
+<xsd:element name="MyType">
+	<xsd:simpleType>
+		<xsd:union>
+			<xsd:simpleType>
+				<xsd:restriction base="boolean" />
+			</xsd:simpleType>
+			<xsd:simpleType>
+				<xsd:list itemType="integer" />
+			</xsd:simpleType>
+			<xsd:simpleType>
+				<xsd:list itemType="float" />
+			</xsd:simpleType>
+		</xsd:union>
+	</xsd:simpleType>
+</xsd:element> 
+
 
 
 </xsd:schema>
diff --git a/xsdconvert/ComplexType.cc b/xsdconvert/ComplexType.cc
index fcfa384cba59aff2d1a846b34f2ba21501d40185..cfd9d41292710eb4fa704f2ac676769522549d6d 100644
--- a/xsdconvert/ComplexType.cc
+++ b/xsdconvert/ComplexType.cc
@@ -587,7 +587,6 @@ void ComplexType::loadWithValues() {
       break;
     case n_list:
       if (parent != NULL && parent->basefield == this) {
-        parent->inList = true;
         parent->SimpleType::loadWithValues();
         parent->basefield = NULL;
         setInvisible();
@@ -662,6 +661,17 @@ void ComplexType::modifyValues() {
   }
 }
 
+void ComplexType::modifyList() {
+  if (this != actfield) {
+    ((SimpleType*)actfield)->modifyList();
+    return;
+  }
+  if (!inList && mode == listMode && parent != NULL) {
+    parent->actfield = parent;
+    parent->lastType = xsdtype;
+  }
+}
+
 void ComplexType::referenceResolving() {
   if (resolved != No) return; // nothing to do
   if(this == subsGroup){
diff --git a/xsdconvert/ComplexType.hh b/xsdconvert/ComplexType.hh
index 7ce650dd176763528ec53cd9bca3ceae089df3dd..1561689e7140d8a41bf82e78338cfb37c405612d 100644
--- a/xsdconvert/ComplexType.hh
+++ b/xsdconvert/ComplexType.hh
@@ -141,6 +141,7 @@ public:
   void nameConversion(NameConversionMode mode, const List<NamespaceType> & ns);
   void finalModification();
   bool hasUnresolvedReference(){ return resolved == No; }
+  void modifyList();
   void setNameDep(SimpleType * dep) { nameDep = dep; }
   void setParentTypeSubsGroup(ComplexType * dep) { parentTypeSubsGroup = dep; }
 
diff --git a/xsdconvert/SimpleType.cc b/xsdconvert/SimpleType.cc
index 4be2edf2d565be8deed6ea959e4950831862f162..e4d974056d7f39fa9f93cf40166eb90465afe5b6 100644
--- a/xsdconvert/SimpleType.cc
+++ b/xsdconvert/SimpleType.cc
@@ -793,6 +793,10 @@ bool SimpleType::hasUnresolvedReference() {
   }
 }
 
+void SimpleType::modifyList() {
+  // Intentional empty
+}
+
 void SimpleType::applyRefAttribute(const Mstring& ref_value) {
   if (!ref_value.empty()) {
     setReference(ref_value);
diff --git a/xsdconvert/SimpleType.hh b/xsdconvert/SimpleType.hh
index 4318fedc341f1379e33428c42ab70f0bcae9cf31..1babbe3277c3dfc63a55ab289a4afef85b984fb6 100644
--- a/xsdconvert/SimpleType.hh
+++ b/xsdconvert/SimpleType.hh
@@ -278,6 +278,7 @@ public:
   void nameConversion(const NameConversionMode mode, const List<NamespaceType> & ns);
   void finalModification();
   virtual bool hasUnresolvedReference();
+  virtual void modifyList();
   void dump(const unsigned int depth) const;
 
   void applyDefaultAttribute(const Mstring& default_value);
diff --git a/xsdconvert/XMLParser.cc b/xsdconvert/XMLParser.cc
index d9857d9e99d9491edeb6dd9921f2c0507a78bf18..eefab2090447d0688000b91806f4789184b3767a 100644
--- a/xsdconvert/XMLParser.cc
+++ b/xsdconvert/XMLParser.cc
@@ -54,7 +54,8 @@ XMLParser::XMLParser(const char * a_filename)
 , actualTagName(n_NOTSET)
 , actualTagAttributes(this)
 , parentTagNames()
-, inside_annotation(){
+, inside_annotation()
+, lastWasListEnd(false){
   xmlSetExternalEntityLoader(xmlNoNetExternalEntityLoader);
 
   parserCheckingXML = (xmlSAXHandler *) malloc(sizeof (xmlSAXHandler));
@@ -302,9 +303,13 @@ void XMLParser::startelementHandler(const xmlChar * localname,
 
     default:
       if (module->hasDefinedMainType()) {
-         if(actualTagName == n_annotation ||
-            actualTagName == n_appinfo ||
-            actualTagName == n_documentation){
+        if (lastWasListEnd) {
+          ((SimpleType&)(module->getLastMainType())).modifyList();
+          lastWasListEnd = false;
+        }
+        if(actualTagName == n_annotation ||
+          actualTagName == n_appinfo ||
+          actualTagName == n_documentation){
           inside_annotation.push_back(actualTagName);
           module->getLastMainType().loadWithValues();
         }else if(inside_annotation.empty()){
@@ -323,6 +328,9 @@ void XMLParser::startelementHandler(const xmlChar * localname,
 
   ++actualDepth;
   parentTagNames.push_back(actualTagName);
+  if (lastWasListEnd) {
+    lastWasListEnd = false;
+  }
 }
 
 void XMLParser::endelementHandler(const xmlChar * localname) {
@@ -355,12 +363,15 @@ void XMLParser::endelementHandler(const xmlChar * localname) {
   }
   
   if(tag == n_list) {
-      if(module->hasDefinedMainType()) {
-          SimpleType& st = (SimpleType&)(module->getLastMainType());
-          if(st.getXsdtype() == n_NOTSET){
-            st.setMode(SimpleType::restrictionAfterListMode);
-          }
+    lastWasListEnd = true;
+    if(module->hasDefinedMainType()) {
+      SimpleType& st = (SimpleType&)(module->getLastMainType());
+      if(st.getXsdtype() == n_NOTSET){
+        st.setMode(SimpleType::restrictionAfterListMode);
       }
+    }
+  } else if (tag != n_simpleType){
+    lastWasListEnd = false;
   }
 
   --actualDepth;
diff --git a/xsdconvert/XMLParser.hh b/xsdconvert/XMLParser.hh
index 8f93e9d552e960c2d322179623ba80074e1746c3..fa7f4887d029a5840bfb709b951a5da732f26e47 100644
--- a/xsdconvert/XMLParser.hh
+++ b/xsdconvert/XMLParser.hh
@@ -172,6 +172,8 @@ private:
 
   // Stack for keeping track if we are inside an annotation tag
   List<TagName> inside_annotation;
+  
+  bool lastWasListEnd;
 
   static bool suspended;