diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 22830e86b..9fb8b3db1 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.328.1"
+    version="5.20.328.2"
     type="win32"
   />
   <description>Notepad3 RC3</description>
diff --git a/src/Edit.c b/src/Edit.c
index 6266441d6..293cf7760 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -4693,7 +4693,8 @@ static int _wcsicoll_s(const wchar_t* s1, const wchar_t* s2) { return wcsicoll_s
 // ----------------------------------------------------------------------------
 
 int CmpStdLogical(const void *s1, const void *s2) {
-  if (s1 && s2) {
+  if (StrIsNotEmpty(s1) && StrIsNotEmpty(s2))
+  {
     int cmp = StrCmpLogicalW(((SORTLINE*)s1)->pwszSortEntry, ((SORTLINE*)s2)->pwszSortEntry);
     if (cmp == 0) {
       cmp = StrCmpLogicalW(((SORTLINE*)s1)->pwszLine, ((SORTLINE*)s2)->pwszLine);
@@ -4701,7 +4702,7 @@ int CmpStdLogical(const void *s1, const void *s2) {
     return (cmp) ? cmp : CmpStd(s1, s2);
   }
   else {
-    return (s1 ? 1 : (s2 ? -1 : 0));
+    return (StrIsNotEmpty(s1) ? 1 : (StrIsNotEmpty(s2) ? -1 : 0));
   }
 }
 
diff --git a/src/VersionEx.h b/src/VersionEx.h
index d91a9f9fd..6c07bcba7 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -9,7 +9,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
 #define VERSION_REV 328
-#define VERSION_BUILD 1
+#define VERSION_BUILD 2
 #define SCINTILLA_VER 432
 #define ONIGURUMA_REGEX_VER 6.9.4
 #define UCHARDET_VER 2018.09.27