diff --git a/ExplorerPatcher/ExplorerPatcher.rc b/ExplorerPatcher/ExplorerPatcher.rc
index eb6a34b..7ac0487 100644
--- a/ExplorerPatcher/ExplorerPatcher.rc
+++ b/ExplorerPatcher/ExplorerPatcher.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22000,282,32,4
- PRODUCTVERSION 22000,282,32,4
+ FILEVERSION 22000,282,32,5
+ PRODUCTVERSION 22000,282,32,5
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "VALINET Solutions SRL"
             VALUE "FileDescription", "ExplorerPatcher"
-            VALUE "FileVersion", "22000.282.32.4"
+            VALUE "FileVersion", "22000.282.32.5"
             VALUE "InternalName", "ExplorerPatcher.dll"
             VALUE "LegalCopyright", "Copyright (C) 2006-2021 VALINET Solutions SRL. All rights reserved."
             VALUE "OriginalFilename", "ExplorerPatcher.dll"
             VALUE "ProductName", "ExplorerPatcher"
-            VALUE "ProductVersion", "22000.282.32.4"
+            VALUE "ProductVersion", "22000.282.32.5"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index e2f4866..cd415a1 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -864,7 +864,7 @@ INT64 Shell_TrayWndSubclassProc(
     DWORD_PTR   dwRefData
 )
 {
-    if (uMsg == WM_DESTROY)
+    if (uMsg == WM_NCDESTROY)
     {
         RemoveWindowSubclass(hWnd, Shell_TrayWndSubclassProc, Shell_TrayWndSubclassProc);
     }
@@ -1011,7 +1011,7 @@ INT64 ClockButtonSubclassProc(
     DWORD_PTR   dwRefData
 )
 {
-    if (uMsg == WM_DESTROY)
+    if (uMsg == WM_NCDESTROY)
     {
         RemoveWindowSubclass(hWnd, ClockButtonSubclassProc, ClockButtonSubclassProc);
     }
@@ -2345,7 +2345,7 @@ INT64 ShowDesktopSubclassProc(
     DWORD_PTR   dwRefData
 )
 {
-    if (uMsg == WM_DESTROY)
+    if (uMsg == WM_NCDESTROY)
     {
         RemoveWindowSubclass(hWnd, ShowDesktopSubclassProc, ShowDesktopSubclassProc);
     }
diff --git a/libs/sws b/libs/sws
index b16f8a6..99bb6a9 160000
--- a/libs/sws
+++ b/libs/sws
@@ -1 +1 @@
-Subproject commit b16f8a639634a0239fdc624e272b278a0be616d2
+Subproject commit 99bb6a99adb45d905812cb03afccdbaf19fdfe95