diff --git a/SabreTools/SabreTools.cs b/SabreTools/SabreTools.cs
index 94b8019f..c7bccad2 100644
--- a/SabreTools/SabreTools.cs
+++ b/SabreTools/SabreTools.cs
@@ -290,8 +290,12 @@ namespace SabreTools
 					case "diff-reverse-cascade":
 						updateMode |= UpdateMode.DiffReverseCascade;
 						break;
-					case "exclude-of":
+					case "exclude-of": // TODO: Remove entire flag when transitioning to exclude-fields
 						datHeader.ExcludeOf = true;
+
+						datHeader.ExcludeFields.Add(Field.CloneOf);
+						datHeader.ExcludeFields.Add(Field.RomOf);
+						datHeader.ExcludeFields.Add(Field.SampleOf);
 						break;
 					case "extension":
 						splittingMode |= SplittingMode.Extension;