diff --git a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
index 20a1925b..2282b5cb 100644
--- a/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
+++ b/SabreTools.Helper/Dats/Partials/DatFile.Rebuild.cs
@@ -71,6 +71,20 @@ namespace SabreTools.Helper.Dats
 				FileTools.CleanDirectory(tempDir);
 			}
 
+			// Now we want to get forcepack flag if it's not overridden
+			if (outputFormat == OutputFormat.Folder && ForcePacking != ForcePacking.None)
+			{
+				switch (ForcePacking)
+				{
+					case ForcePacking.Zip:
+						outputFormat = OutputFormat.TorrentZip;
+						break;
+					case ForcePacking.Unzip;
+						outputFormat = OutputFormat.Folder;
+						break;
+				}
+			}
+
 			// Preload the Skipper list
 			int listcount = Skipper.List.Count;
 
@@ -244,6 +258,20 @@ namespace SabreTools.Helper.Dats
 				FileTools.CleanDirectory(tempDir);
 			}
 
+			// Now we want to get forcepack flag if it's not overridden
+			if (outputFormat == OutputFormat.Folder && ForcePacking != ForcePacking.None)
+			{
+				switch (ForcePacking)
+				{
+					case ForcePacking.Zip:
+						outputFormat = OutputFormat.TorrentZip;
+						break;
+					case ForcePacking.Unzip;
+						outputFormat = OutputFormat.Folder;
+						break;
+				}
+			}
+
 			// Preload the Skipper list
 			int listcount = Skipper.List.Count;