diff --git a/SabreTools.Library/Dats/Archive.cs b/SabreTools.Library/Dats/Archive.cs
index 7c90fb46..ba9cd3b2 100644
--- a/SabreTools.Library/Dats/Archive.cs
+++ b/SabreTools.Library/Dats/Archive.cs
@@ -28,7 +28,7 @@ namespace SabreTools.Library.Dats
 				Type = this.Type,
 				Dupe = this.Dupe,
 
-				Machine = this.Machine,
+				Machine = (Machine)this.Machine.Clone(),
 
 				Supported = this.Supported,
 				Publisher = this.Publisher,
diff --git a/SabreTools.Library/Dats/BiosSet.cs b/SabreTools.Library/Dats/BiosSet.cs
index 48ed1ea6..266f512f 100644
--- a/SabreTools.Library/Dats/BiosSet.cs
+++ b/SabreTools.Library/Dats/BiosSet.cs
@@ -50,7 +50,7 @@ namespace SabreTools.Library.Dats
 				Type = this.Type,
 				Dupe = this.Dupe,
 
-				Machine = this.Machine,
+				Machine = (Machine)this.Machine.Clone(),
 
 				Supported = this.Supported,
 				Publisher = this.Publisher,
diff --git a/SabreTools.Library/Dats/DatItem.cs b/SabreTools.Library/Dats/DatItem.cs
index 9a2b81dd..75c05f90 100644
--- a/SabreTools.Library/Dats/DatItem.cs
+++ b/SabreTools.Library/Dats/DatItem.cs
@@ -609,7 +609,7 @@ namespace SabreTools.Library.Dats
 							{
 								saveditem.SystemID = file.SystemID;
 								saveditem.System = file.System;
-								saveditem.Machine = file.Machine;
+								saveditem.Machine = (Machine)file.Machine.Clone();
 								saveditem.Name = file.Name;
 							}
 
@@ -618,7 +618,7 @@ namespace SabreTools.Library.Dats
 							{
 								saveditem.SourceID = file.SourceID;
 								saveditem.Source = file.Source;
-								saveditem.Machine = file.Machine;
+								saveditem.Machine = (Machine)file.Machine.Clone();
 								saveditem.Name = file.Name;
 							}
 
diff --git a/SabreTools.Library/Dats/Disk.cs b/SabreTools.Library/Dats/Disk.cs
index 50133a2c..09acefd1 100644
--- a/SabreTools.Library/Dats/Disk.cs
+++ b/SabreTools.Library/Dats/Disk.cs
@@ -79,7 +79,7 @@ namespace SabreTools.Library.Dats
 				Type = this.Type,
 				Dupe = this.Dupe,
 
-				Machine = this.Machine,
+				Machine = (Machine)this.Machine.Clone(),
 
 				Supported = this.Supported,
 				Publisher = this.Publisher,
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs b/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs
index 1e68f91d..fc59f607 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.Manipulate.cs
@@ -546,7 +546,7 @@ namespace SabreTools.Library.Dats
 					{
 						case ItemType.Archive:
 							Archive archive = ((Archive)item).Clone() as Archive;
-							archive.Machine = currentMachine;
+							archive.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == archive.Name).Count() == 0 && !this[game].Contains(archive))
 							{
 								Add(game, archive);
@@ -555,7 +555,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.BiosSet:
 							BiosSet biosSet = ((BiosSet)item).Clone() as BiosSet;
-							biosSet.Machine = currentMachine;
+							biosSet.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == biosSet.Name).Count() == 0 && !this[game].Contains(biosSet))
 							{
 								Add(game, biosSet);
@@ -564,7 +564,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.Disk:
 							Disk disk = ((Disk)item).Clone() as Disk;
-							disk.Machine = currentMachine;
+							disk.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == disk.Name).Count() == 0 && !this[game].Contains(disk))
 							{
 								Add(game, disk);
@@ -573,7 +573,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.Release:
 							Release release = ((Release)item).Clone() as Release;
-							release.Machine = currentMachine;
+							release.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == release.Name).Count() == 0 && !this[game].Contains(release))
 							{
 								Add(game, release);
@@ -582,7 +582,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.Rom:
 							Rom rom = ((Rom)item).Clone() as Rom;
-							rom.Machine = currentMachine;
+							rom.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == rom.Name).Count() == 0 && !this[game].Contains(rom))
 							{
 								Add(game, rom);
@@ -591,7 +591,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.Sample:
 							Sample sample = ((Sample)item).Clone() as Sample;
-							sample.Machine = currentMachine;
+							sample.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == sample.Name).Count() == 0 && !this[game].Contains(sample))
 							{
 								Add(game, sample);
@@ -637,7 +637,7 @@ namespace SabreTools.Library.Dats
 						{
 							case ItemType.Archive:
 								Archive archive = ((Archive)item).Clone() as Archive;
-								archive.Machine = musheen;
+								archive.Machine = (Machine)musheen.Clone();
 								if (this[game].Where(i => i.Name == archive.Name).Count() == 0 && !this[game].Contains(archive))
 								{
 									Add(game, archive);
@@ -646,7 +646,7 @@ namespace SabreTools.Library.Dats
 								break;
 							case ItemType.BiosSet:
 								BiosSet biosSet = ((BiosSet)item).Clone() as BiosSet;
-								biosSet.Machine = musheen;
+								biosSet.Machine = (Machine)musheen.Clone();
 								if (this[game].Where(i => i.Name == biosSet.Name).Count() == 0 && !this[game].Contains(biosSet))
 								{
 									Add(game, biosSet);
@@ -655,7 +655,7 @@ namespace SabreTools.Library.Dats
 								break;
 							case ItemType.Disk:
 								Disk disk = ((Disk)item).Clone() as Disk;
-								disk.Machine = musheen;
+								disk.Machine = (Machine)musheen.Clone();
 								if (this[game].Where(i => i.Name == disk.Name).Count() == 0 && !this[game].Contains(disk))
 								{
 									Add(game, disk);
@@ -664,7 +664,7 @@ namespace SabreTools.Library.Dats
 								break;
 							case ItemType.Release:
 								Release release = ((Release)item).Clone() as Release;
-								release.Machine = musheen;
+								release.Machine = (Machine)musheen.Clone();
 								if (this[game].Where(i => i.Name == release.Name).Count() == 0 && !this[game].Contains(release))
 								{
 									Add(game, release);
@@ -673,7 +673,7 @@ namespace SabreTools.Library.Dats
 								break;
 							case ItemType.Rom:
 								Rom rom = ((Rom)item).Clone() as Rom;
-								rom.Machine = musheen;
+								rom.Machine = (Machine)musheen.Clone();
 								if (this[game].Where(i => i.Name == rom.Name).Count() == 0 && !this[game].Contains(rom))
 								{
 									Add(game, rom);
@@ -682,7 +682,7 @@ namespace SabreTools.Library.Dats
 								break;
 							case ItemType.Sample:
 								Sample sample = ((Sample)item).Clone() as Sample;
-								sample.Machine = musheen;
+								sample.Machine = (Machine)musheen.Clone();
 								if (this[game].Where(i => i.Name == sample.Name).Count() == 0 && !this[game].Contains(sample))
 								{
 									Add(game, sample);
@@ -738,7 +738,7 @@ namespace SabreTools.Library.Dats
 					{
 						case ItemType.Archive:
 							Archive archive = ((Archive)item).Clone() as Archive;
-							archive.Machine = currentMachine;
+							archive.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == archive.Name).Count() == 0 && !this[game].Contains(archive))
 							{
 								Add(game, archive);
@@ -747,7 +747,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.BiosSet:
 							BiosSet biosSet = ((BiosSet)item).Clone() as BiosSet;
-							biosSet.Machine = currentMachine;
+							biosSet.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == biosSet.Name).Count() == 0 && !this[game].Contains(biosSet))
 							{
 								Add(game, biosSet);
@@ -756,7 +756,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.Disk:
 							Disk disk = ((Disk)item).Clone() as Disk;
-							disk.Machine = currentMachine;
+							disk.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == disk.Name).Count() == 0 && !this[game].Contains(disk))
 							{
 								Add(game, disk);
@@ -765,7 +765,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.Release:
 							Release release = ((Release)item).Clone() as Release;
-							release.Machine = currentMachine;
+							release.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == release.Name).Count() == 0 && !this[game].Contains(release))
 							{
 								Add(game, release);
@@ -774,7 +774,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.Rom:
 							Rom rom = ((Rom)item).Clone() as Rom;
-							rom.Machine = currentMachine;
+							rom.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == rom.Name).Count() == 0 && !this[game].Contains(rom))
 							{
 								Add(game, rom);
@@ -783,7 +783,7 @@ namespace SabreTools.Library.Dats
 							break;
 						case ItemType.Sample:
 							Sample sample = ((Sample)item).Clone() as Sample;
-							sample.Machine = currentMachine;
+							sample.Machine = (Machine)currentMachine.Clone();
 							if (this[game].Where(i => i.Name == sample.Name).Count() == 0 && !this[game].Contains(sample))
 							{
 								Add(game, sample);
@@ -832,7 +832,7 @@ namespace SabreTools.Library.Dats
 					// If the disk doesn't have a valid merge tag OR the merged file doesn't exist in the parent, then add it
 					if (item.Type == ItemType.Disk && (item.MergeTag == null || !this[parent].Select(i => i.Name).Contains(item.MergeTag)))
 					{
-						item.Machine = parentMachine;
+						item.Machine = (Machine)parentMachine.Clone();
 						Add(parent, item);
 					}
 
@@ -843,7 +843,7 @@ namespace SabreTools.Library.Dats
 						item.Name = item.Machine.Name + "\\" + item.Name;
 
 						// Update the machine to be the new parent
-						item.Machine = parentMachine;
+						item.Machine = (Machine)parentMachine.Clone();
 
 						// Add the rom to the parent set
 						Add(parent, item);
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs b/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs
index b63325c0..0ff04874 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.Parsers.cs
@@ -2761,7 +2761,7 @@ namespace SabreTools.Library.Dats
 										SHA512 = xtr.GetAttribute("sha512")?.ToLowerInvariant(),
 										ItemStatus = its,
 
-										Machine = dir,
+										Machine = (Machine)dir.Clone(),
 
 										SystemID = sysid,
 										System = filename,
@@ -2783,7 +2783,7 @@ namespace SabreTools.Library.Dats
 										ItemStatus = its,
 										Date = date,
 
-										Machine = dir,
+										Machine = (Machine)dir.Clone(),
 
 										SystemID = sysid,
 										System = filename,
diff --git a/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs b/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs
index d777a6ae..df58d464 100644
--- a/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs
+++ b/SabreTools.Library/Dats/Partials/DatFile.Rebuild.cs
@@ -777,7 +777,7 @@ namespace SabreTools.Library.Dats
 							foreach (Rom item in dupes)
 							{
 								// Create a headered item to use as well
-								rom.Machine = item.Machine;
+								rom.Machine = (Machine)item.Machine.Clone();
 								rom.Name += "_" + rom.CRC;
 
 								// If either copy succeeds, then we want to set rebuilt to true
diff --git a/SabreTools.Library/Dats/Release.cs b/SabreTools.Library/Dats/Release.cs
index fb3eadbb..6412732d 100644
--- a/SabreTools.Library/Dats/Release.cs
+++ b/SabreTools.Library/Dats/Release.cs
@@ -67,7 +67,7 @@ namespace SabreTools.Library.Dats
 				Type = this.Type,
 				Dupe = this.Dupe,
 
-				Machine = this.Machine,
+				Machine = (Machine)this.Machine.Clone(),
 
 				Supported = this.Supported,
 				Publisher = this.Publisher,
diff --git a/SabreTools.Library/Dats/Rom.cs b/SabreTools.Library/Dats/Rom.cs
index ab7783f1..57cdd0cc 100644
--- a/SabreTools.Library/Dats/Rom.cs
+++ b/SabreTools.Library/Dats/Rom.cs
@@ -107,7 +107,7 @@ namespace SabreTools.Library.Dats
 				Type = this.Type,
 				Dupe = this.Dupe,
 
-				Machine = this.Machine,
+				Machine = (Machine)this.Machine.Clone(),
 
 				Supported = this.Supported,
 				Publisher = this.Publisher,
diff --git a/SabreTools.Library/Dats/Sample.cs b/SabreTools.Library/Dats/Sample.cs
index 5a5d55b5..2740e8a2 100644
--- a/SabreTools.Library/Dats/Sample.cs
+++ b/SabreTools.Library/Dats/Sample.cs
@@ -29,7 +29,7 @@ namespace SabreTools.Library.Dats
 				Type = this.Type,
 				Dupe = this.Dupe,
 
-				Machine = this.Machine,
+				Machine = (Machine)this.Machine.Clone(),
 
 				Supported = this.Supported,
 				Publisher = this.Publisher,