diff --git a/DuetPkg/DxeIpl/DxeInit.c b/DuetPkg/DxeIpl/DxeInit.c
index df360cbca9..b10e273f0c 100644
--- a/DuetPkg/DxeIpl/DxeInit.c
+++ b/DuetPkg/DxeIpl/DxeInit.c
@@ -138,7 +138,11 @@ Returns:
   VOID                  *MemoryDescriptor;
   VOID                  *NvStorageBase;
   CHAR8                 PrintBuffer[256];
-  
+  EFILDRHANDOFF         HandoffCopy;
+
+  CopyMem ((VOID*) &HandoffCopy, (VOID*) Handoff, sizeof (EFILDRHANDOFF));
+  Handoff = &HandoffCopy;
+
   ClearScreen();
   PrintString("Enter DxeIpl ...\n");
   
diff --git a/DuetPkg/EfiLdr/EfiLoader.c b/DuetPkg/EfiLdr/EfiLoader.c
index 609e547483..f10db53552 100644
--- a/DuetPkg/EfiLdr/EfiLoader.c
+++ b/DuetPkg/EfiLdr/EfiLoader.c
@@ -50,7 +50,7 @@ EfiLoader (
   UINTN                 BfvBase;
   EFI_MAIN_ENTRYPOINT   EfiMainEntrypoint;
   CHAR8                 PrintBuffer[256];
-  STATIC EFILDRHANDOFF  Handoff;
+  EFILDRHANDOFF         Handoff;
 
   ClearScreen();