diff --git a/ISOv4Plugin/Mappers/PartfieldMapper.cs b/ISOv4Plugin/Mappers/PartfieldMapper.cs
index 8887a59..051acd2 100644
--- a/ISOv4Plugin/Mappers/PartfieldMapper.cs
+++ b/ISOv4Plugin/Mappers/PartfieldMapper.cs
@@ -90,7 +90,9 @@ public ISOPartfield ExportField(Field adaptField)
 
             //Boundary
             PolygonMapper polygonMapper = new PolygonMapper(TaskDataMapper);
-            FieldBoundary boundary = DataModel.Catalog.FieldBoundaries.SingleOrDefault(b => b.FieldId == adaptField.Id.ReferenceId);
+
+            var boundaries = DataModel.Catalog.FieldBoundaries.Where(b => b.FieldId == adaptField.Id.ReferenceId).ToList();
+            var boundary = boundaries.FirstOrDefault(b=> b.Id.ReferenceId == adaptField.ActiveBoundaryId) ?? boundaries.FirstOrDefault();
             if (boundary != null)
             {
                 IEnumerable<ISOPolygon> isoPolygons = polygonMapper.ExportMultipolygon(boundary.SpatialData, ISOEnumerations.ISOPolygonType.PartfieldBoundary);