diff --git a/development/Win32/packaging/installer2/src/main.nsh b/development/Win32/packaging/installer2/src/main.nsh
index ea18e052dd..e39cdfb3b6 100644
--- a/development/Win32/packaging/installer2/src/main.nsh
+++ b/development/Win32/packaging/installer2/src/main.nsh
@@ -258,21 +258,24 @@
     Exch $9 # resultRegIdx
   FunctionEnd
   
-  !macro CreatePrepareShellCTXFun UnPrefix
-    Function ${UnPrefix}PrepareShellCTX
-      ${if} $MultiUser.InstallMode == "CurrentUser"
-        SetShellVarContext current
-      ${Else}
-        SetShellVarContext all
-      ${EndIf}
-      ${If} ${RunningX64}
-        SetRegView ${APP_ARCHITECTURE}
-      ${EndIf}
-    FunctionEnd
+  !macro PrepareShellCTX
+    ${if} $MultiUser.InstallMode == "CurrentUser"
+      SetShellVarContext current
+    ${Else}
+      SetShellVarContext all
+    ${EndIf}
+    ${If} ${RunningX64}
+      SetRegView ${APP_ARCHITECTURE}
+    ${EndIf}
   !macroend
-  
-  !insertmacro CreatePrepareShellCTXFun ""
-  !insertmacro CreatePrepareShellCTXFun "un."
+
+  Function PrepareShellCTX
+    !insertmacro PrepareShellCTX
+  FunctionEnd
+
+  Function un.PrepareShellCTX
+    !insertmacro PrepareShellCTX
+  FunctionEnd
 
 #-------------------------------------------------------------
 # - - - - - - - - - - - - Sections - - - - - - - - - - - - - -