diff --git a/src/indice.Edi/Serialization/EdiPropertyDescriptor.cs b/src/indice.Edi/Serialization/EdiPropertyDescriptor.cs
index 29c8648..d90808d 100644
--- a/src/indice.Edi/Serialization/EdiPropertyDescriptor.cs
+++ b/src/indice.Edi/Serialization/EdiPropertyDescriptor.cs
@@ -110,7 +110,7 @@ public EdiPropertyDescriptor(PropertyInfo info, IEnumerable<EdiAttribute> attrib
             if (_SegmentGroupInfo != null && _SegmentGroupInfo.StartInternal.Segment != null && pathInfo == null) {
                 pathInfo = new EdiPathAttribute(_SegmentGroupInfo.StartInternal.Segment);
             }
-            if (pathInfo != null && structureType == EdiStructureType.None && pathInfo.PathInternal.Segment.IsWildcard) {
+            if (pathInfo != null && (structureType == EdiStructureType.None || structureType == EdiStructureType.Element)  && pathInfo.PathInternal.Segment.IsWildcard) {
                 var parentPathInfo = info.DeclaringType.GetTypeInfo().GetCustomAttributes<EdiPathAttribute>().FirstOrDefault();
                 if (parentPathInfo != null) {
                     pathInfo = new EdiPathAttribute(new EdiPath(new EdiPathFragment(parentPathInfo.Segment), pathInfo.PathInternal.Element, pathInfo.PathInternal.Component));
diff --git a/test/indice.Edi.Tests/Samples/Aperak_issue235 xml.txt b/test/indice.Edi.Tests/Samples/Aperak_issue235 xml.txt
deleted file mode 100644
index 003b0a0..0000000
--- a/test/indice.Edi.Tests/Samples/Aperak_issue235 xml.txt	
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-16"?>
-<APERAK xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-	<UNB>
-		<S001>
-			<E0001>UNOA</E0001>
-			<E0002>3</E0002>
-		</S001>
-		<S002>
-			<E0004>8717982000004</E0004>
-			<E0007>14</E0007>
-		</S002>
-		<S003>
-			<E0010>8717045000002</E0010>
-			<E0007>14</E0007>
-		</S003>
-		<S004>
-			<E0017>210504</E0017>
-			<E0019>1310</E0019>
-		</S004>
-		<E0020>4</E0020>
-	</UNB>
-	<CONTENT>
-		<UNH>
-			<E0062>041310181</E0062>
-			<S009>
-				<E0065>APERAK</E0065>
-				<E0052>D</E0052>
-				<E0054>96A</E0054>
-				<E0051>UN</E0051>
-			</S009>
-		</UNH>
-		<BGM>
-			<C002/>
-			<C106>
-				<E1004>0109094405</E1004>
-			</C106>
-		</BGM>
-		<DTM>
-			<C507>
-				<E2005>137</E2005>
-				<E2380>202105041310</E2380>
-				<E2379>203</E2379>
-			</C507>
-		</DTM>
-		<SG2>
-			<RFF>
-				<C506>
-					<E1153>ON</E1153>
-					<E1154>4506701767</E1154>
-				</C506>
-			</RFF>
-			<DTM>
-				<C507>
-					<E2005>171</E2005>
-					<E2380>20210504</E2380>
-					<E2379>102</E2379>
-				</C507>
-			</DTM>
-		</SG2>
-		<SG3>
-			<NAD>
-				<E3035>BY</E3035>
-				<C082>
-					<E3039>8717045000248</E3039>
-					<E3055>9</E3055>
-				</C082>
-			</NAD>
-		</SG3>
-		<SG3>
-			<NAD>
-				<E3035>SU</E3035>
-				<C082>
-					<E3039>8717982000004</E3039>
-					<E3055>9</E3055>
-				</C082>
-			</NAD>
-		</SG3>
-		<SG3>
-			<NAD>
-				<E3035>DP</E3035>
-				<C082>
-					<E3039>8717045000248</E3039>
-					<E3055>9</E3055>
-				</C082>
-			</NAD>
-		</SG3>
-		<UNT>
-			<E0074>9</E0074>
-			<E0062>041310181</E0062>
-		</UNT>
-	</CONTENT>
-	<UNZ>
-		<E0036>1</E0036>
-		<E0020>4</E0020>
-	</UNZ>
-</APERAK>
\ No newline at end of file
diff --git a/test/indice.Edi.Tests/Samples/Aperak_issue235.xml b/test/indice.Edi.Tests/Samples/Aperak_issue235.xml
new file mode 100644
index 0000000..5fe45b3
Binary files /dev/null and b/test/indice.Edi.Tests/Samples/Aperak_issue235.xml differ
diff --git a/test/indice.Edi.Tests/Samples/Apperak edi_out_issue235.txt b/test/indice.Edi.Tests/Samples/Apperak edi_out_issue235.edi
similarity index 100%
rename from test/indice.Edi.Tests/Samples/Apperak edi_out_issue235.txt
rename to test/indice.Edi.Tests/Samples/Apperak edi_out_issue235.edi
diff --git a/test/indice.Edi.Tests/SerializerTests.cs b/test/indice.Edi.Tests/SerializerTests.cs
index b30598a..be4d631 100644
--- a/test/indice.Edi.Tests/SerializerTests.cs
+++ b/test/indice.Edi.Tests/SerializerTests.cs
@@ -3,7 +3,9 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Xml.Serialization;
 using indice.Edi.Tests.Models;
 using Xunit;
 
@@ -442,5 +444,27 @@ string Serialize<T>(T data) {
                 return writer.ToString();
             }
         }
+
+        [Fact, Trait(Traits.Tag, "EDIFact"), Trait(Traits.Issue, "#235")]
+        public void Serialize_Should_not_create_double_UNB_Segment_Issue235() {
+            var source = default(EDIFACT_APPERAK_issue235);
+            using (var stream = Helpers.GetResourceStream("Aperak_issue235.xml")) {
+                var serializer = new XmlSerializer(typeof(EDIFACT_APPERAK_issue235));
+                source = (EDIFACT_APPERAK_issue235)serializer.Deserialize(stream);
+            }
+            Assert.NotNull(source);
+
+            
+            string Serialize<T>(T data) {
+                var grammar = EdiGrammar.NewEdiFact();
+                using var writer = new StringWriter();
+                new EdiSerializer().Serialize(writer, grammar, data);
+                return writer.ToString();
+            }
+
+            var output = Serialize(source);
+            Regex unbRegex = new Regex("UNB");
+            Assert.Single(unbRegex.Matches(output));
+        }
     }
 }
diff --git a/test/indice.Edi.Tests/indice.Edi.Tests.csproj b/test/indice.Edi.Tests/indice.Edi.Tests.csproj
index abac45b..61d2c56 100644
--- a/test/indice.Edi.Tests/indice.Edi.Tests.csproj
+++ b/test/indice.Edi.Tests/indice.Edi.Tests.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Samples\**\*.edi" />
+    <EmbeddedResource Include="Samples\**\*.xml" />
     <None Update="SamplesBig\**\*.edi">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>