diff --git a/SabreTools.Metadata.DatItems.Test/DatItemTests.cs b/SabreTools.Metadata.DatItems.Test/DatItemTests.cs
index 32028d39..fc9a82f0 100644
--- a/SabreTools.Metadata.DatItems.Test/DatItemTests.cs
+++ b/SabreTools.Metadata.DatItems.Test/DatItemTests.cs
@@ -32,7 +32,7 @@ namespace SabreTools.Metadata.DatItems.Test
             /// <inheritdoc/>
             public override object Clone() => new TestDatItem()
             {
-                _internal = _internal.DeepClone() as TestDatItemModel ?? []
+                _internal = GetInternalClone(),
             };
 
             /// <inheritdoc/>
diff --git a/SabreTools.Metadata.DatItems/Machine.cs b/SabreTools.Metadata.DatItems/Machine.cs
index f772c721..eb5f7301 100644
--- a/SabreTools.Metadata.DatItems/Machine.cs
+++ b/SabreTools.Metadata.DatItems/Machine.cs
@@ -364,14 +364,14 @@ namespace SabreTools.Metadata.DatItems
         {
             return new Machine()
             {
-                _internal = _internal.DeepClone() as Data.Models.Metadata.Machine ?? [],
+                _internal = GetInternalClone(),
             };
         }
 
         /// <summary>
         /// Get a clone of the current internal model
         /// </summary>
-        public Data.Models.Metadata.Machine GetInternalClone() => (_internal.DeepClone() as Data.Models.Metadata.Machine)!;
+        public Data.Models.Metadata.Machine GetInternalClone() => (_internal.DeepClone() as Data.Models.Metadata.Machine) ?? [];
 
         #endregion