diff --git a/Shared/Models/Stateless/Methods/Property.cs b/Shared/Models/Stateless/Methods/Property.cs
index efe86c5..3ab1c7c 100644
--- a/Shared/Models/Stateless/Methods/Property.cs
+++ b/Shared/Models/Stateless/Methods/Property.cs
@@ -91,13 +91,18 @@ internal abstract class Property
         List<DateTime> results =
         [
             creationTime,
-            lastWriteTime,
-            .. dateTime.HasValue ? [dateTime.Value] : [],
-            .. dateTimeDigitized.HasValue ? [dateTimeDigitized.Value] : [],
-            .. dateTimeFromName.HasValue ? [dateTimeFromName.Value] : [],
-            .. dateTimeOriginal.HasValue ? [dateTimeOriginal.Value] : [],
-            .. gpsDateStamp.HasValue ? [gpsDateStamp.Value] : [],
+            lastWriteTime
         ];
+        if (dateTime.HasValue)
+            results.Add(dateTime.Value);
+        if (dateTimeDigitized.HasValue)
+            results.Add(dateTimeDigitized.Value);
+        if (dateTimeFromName.HasValue)
+            results.Add(dateTimeFromName.Value);
+        if (dateTimeOriginal.HasValue)
+            results.Add(dateTimeOriginal.Value);
+        if (gpsDateStamp.HasValue)
+            results.Add(gpsDateStamp.Value);
         return results;
     }
 
@@ -111,13 +116,18 @@ internal abstract class Property
             List<DateTime> dateTimes =
             [
                 property.CreationTime,
-                property.LastWriteTime,
-                .. property.DateTime.HasValue ? [property.DateTime.Value] : [],
-                .. property.DateTimeDigitized.HasValue ? [property.DateTimeDigitized.Value] : [],
-                .. property.DateTimeFromName.HasValue ? [property.DateTimeFromName.Value] : [],
-                .. property.DateTimeOriginal.HasValue ? [property.DateTimeOriginal.Value] : [],
-                .. property.GPSDateStamp.HasValue ? [property.GPSDateStamp.Value] : [],
+                property.LastWriteTime
             ];
+            if (property.DateTime.HasValue)
+                dateTimes.Add(property.DateTime.Value);
+            if (property.DateTimeDigitized.HasValue)
+                dateTimes.Add(property.DateTimeDigitized.Value);
+            if (property.DateTimeFromName.HasValue)
+                dateTimes.Add(property.DateTimeFromName.Value);
+            if (property.DateTimeOriginal.HasValue)
+                dateTimes.Add(property.DateTimeOriginal.Value);
+            if (property.GPSDateStamp.HasValue)
+                dateTimes.Add(property.GPSDateStamp.Value);
             result = dateTimes.Min();
         }
         return result;