diff --git a/BuildSignatures/PTEBuildSignatures.CodeUnit.al b/BuildSignatures/PTEBuildSignatures.CodeUnit.al
index 953026a..15fac39 100644
--- a/BuildSignatures/PTEBuildSignatures.CodeUnit.al
+++ b/BuildSignatures/PTEBuildSignatures.CodeUnit.al
@@ -26,6 +26,7 @@ codeunit 80198 "PTE BuildSignatures"
         AssemblyStyle: Option Gathering,Collecting,List;
         AssemblyOrderUsed: List of [Integer];
         FinishingSignatureCounter, FinishingSignaturesPerSheet : integer;
+        LastSignatureInitialized: Boolean;
     begin
 
         if in_SheetRec.ID = 0 then
@@ -211,8 +212,10 @@ codeunit 80198 "PTE BuildSignatures"
                                 out_RecTmp.Modify(true);
 
                                 // Special rule for residual sheet
-                                if JobItemTMP."Entry No." = 1 then
-                                    LastSignatureTMP := out_RecTmp
+                                if (JobItemTMP."Entry No." = 1) or (not LastSignatureInitialized) then begin
+                                    LastSignatureTMP := out_RecTmp;
+                                    LastSignatureInitialized := true;
+                                end
                                 else begin
                                     // Switch values with last signature
                                     out_RecTmp."Assembly Order" := LastSignatureTMP."Assembly Order";
diff --git a/Planning Board - ToolTip Performance/PTETooltip.CodeUnit.al b/Planning Board - ToolTip Performance/PTETooltip.CodeUnit.al
index 6411027..361dd97 100644
--- a/Planning Board - ToolTip Performance/PTETooltip.CodeUnit.al	
+++ b/Planning Board - ToolTip Performance/PTETooltip.CodeUnit.al	
@@ -79,6 +79,7 @@ codeunit 80800 "PTE ToolTip"
         AssemblyStyle: Option Gathering,Collecting,List;
         AssemblyOrderUsed: List of [Integer];
         FinishingSignatureCounter, FinishingSignaturesPerSheet : integer;
+        LastSignatureInitialized: Boolean;
     begin
 
         if in_SheetRec.ID = 0 then
@@ -264,8 +265,10 @@ codeunit 80800 "PTE ToolTip"
                                 out_RecTmp.Modify(true);
 
                                 // Special rule for residual sheet
-                                if JobItemTMP."Entry No." = 1 then
-                                    LastSignatureTMP := out_RecTmp
+                                if (JobItemTMP."Entry No." = 1) or (not LastSignatureInitialized) then begin
+                                    LastSignatureTMP := out_RecTmp;
+                                    LastSignatureInitialized := true;
+                                end
                                 else begin
                                     // Switch values with last signature
                                     out_RecTmp."Assembly Order" := LastSignatureTMP."Assembly Order";