diff --git a/XmlSchemaClassGenerator/ModelBuilder.cs b/XmlSchemaClassGenerator/ModelBuilder.cs
index c2f664ba..a994ebbb 100644
--- a/XmlSchemaClassGenerator/ModelBuilder.cs
+++ b/XmlSchemaClassGenerator/ModelBuilder.cs
@@ -941,6 +941,15 @@ private PropertyModel PropertyFromElement(TypeModel owningTypeModel, XmlSchemaEl
         {
             PropertyModel property;
             XmlSchemaElementEx effectiveElement = substitute?.Element ?? element;
+
+            property = properties.FirstOrDefault(p => element.QualifiedName == p.XmlSchemaName && p.Type.XmlSchemaType == element.ElementSchemaType);
+
+            if (property != null)
+            {
+                property.IsCollection = true;
+                return property;
+            }
+
             var name = _configuration.NamingProvider.ElementNameFromQualifiedName(effectiveElement.QualifiedName, effectiveElement);
             var originalName = name;
             if (name == owningTypeModel.Name)
diff --git a/appveyor.yml b/appveyor.yml
index 53f454e8..2dd18e66 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.0.{build}
+version: 2.0.{build}-beta
 skip_tags: true
 image: Visual Studio 2022
 environment: