diff --git a/Contrib/ExDLL/exdll.h b/Contrib/ExDLL/exdll.h
index 301ec31f..4f57e38c 100644
--- a/Contrib/ExDLL/exdll.h
+++ b/Contrib/ExDLL/exdll.h
@@ -11,6 +11,7 @@
 
 // For page showing plug-ins
 #define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
+#define NOTIFY_BYE_BYE 'x'
 
 typedef struct _stack_t {
   struct _stack_t *next;
diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index f448e4ae..4b31efda 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -697,9 +697,9 @@ BOOL CALLBACK cfgDlgProc(HWND   hwndDlg,
     HANDLE_MSG(hwndDlg, WM_COMMAND, WMCommandProc);
     return 0;
     case WM_USER+666:
-      if (wParam == 0xD1E || wParam == -1 || ValidateFields()) {
+      if (wParam == NOTIFY_BYE_BYE || wParam == -1 || ValidateFields()) {
         if (wParam == -1) g_is_back++;
-        if (wParam == 0xD1E) g_is_cancel++;
+        if (wParam == NOTIFY_BYE_BYE) g_is_cancel++;
         g_done++;
         PostMessage(hwndDlg,WM_CLOSE,0,0);
       }
diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c
index 7458c5fa..1dc57ae6 100644
--- a/Contrib/StartMenu/StartMenu.c
+++ b/Contrib/StartMenu/StartMenu.c
@@ -276,7 +276,7 @@ BOOL CALLBACK dlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
     break;
     case WM_USER+666:
       g_done = 1;
-      if (wParam == 0xD1E)
+      if (wParam == NOTIFY_BYE_BYE)
         pushstring("cancel");
       else
       {
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index 74d1406d..3166da13 100644
Binary files a/Plugins/InstallOptions.dll and b/Plugins/InstallOptions.dll differ
diff --git a/Plugins/StartMenu.dll b/Plugins/StartMenu.dll
index bdeb8a00..d6ff6e87 100644
Binary files a/Plugins/StartMenu.dll and b/Plugins/StartMenu.dll differ