diff --git a/SabreTools.Serialization/Wrappers/NewExecutable.Extraction.cs b/SabreTools.Serialization/Wrappers/NewExecutable.Extraction.cs
index 91beaf01..9899cf4a 100644
--- a/SabreTools.Serialization/Wrappers/NewExecutable.Extraction.cs
+++ b/SabreTools.Serialization/Wrappers/NewExecutable.Extraction.cs
@@ -160,7 +160,7 @@ namespace SabreTools.Serialization.Wrappers
                 if (OverlaySize > overlayData.Length)
                 {
                     long currentOffset = OverlayAddress + overlayOffset;
-                    long bytesLeft = OverlaySize;
+                    long bytesLeft = OverlaySize - overlayOffset;
 
                     while (bytesLeft > 0)
                     {
diff --git a/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs
index 902867ab..d466f728 100644
--- a/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs
+++ b/SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs
@@ -221,7 +221,7 @@ namespace SabreTools.Serialization.Wrappers
                 if (OverlaySize > overlayData.Length)
                 {
                     long currentOffset = OverlayAddress + overlayOffset;
-                    long bytesLeft = OverlaySize;
+                    long bytesLeft = OverlaySize - overlayOffset;
 
                     while (bytesLeft > 0)
                     {