diff --git a/Versions/build.txt b/Versions/build.txt
index 78d5c2a3d..1f77d281d 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1730
+1731
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index e173a1755..a52b5548e 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.526.1730"
+    version="5.19.527.1731"
     type="win32"
   />
   <description>Notepad3 RC</description>
diff --git a/src/Edit.c b/src/Edit.c
index 6d9452bb9..17e8cb303 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -6509,7 +6509,8 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, DocPos rangeStart, DocPos
   if (StrIsEmptyA(pszText))
   {
     if (SciCall_IsSelectionEmpty()) {
-      if (flags & SCFIND_WHOLEWORD) { // nothing selected, get word under caret if flagged
+      // nothing selected, get word under caret if flagged
+      if (Settings.MarkOccurrencesCurrentWord && (flags & SCFIND_WHOLEWORD)) {
         DocPos const iCurrPos = SciCall_GetCurrentPos();
         DocPos const iWordStart = SciCall_WordStartPosition(iCurrPos, true);
         DocPos const iWordEnd = SciCall_WordEndPosition(iCurrPos, true);
@@ -6542,7 +6543,7 @@ void EditMarkAll(HWND hwnd, char* pszFind, int flags, DocPos rangeStart, DocPos
           if (StrChrIA(delims, pszText[iSelStart2])) {
             return;
           }
-          iSelStart2++;
+          ++iSelStart2;
         }
       }
     }
diff --git a/src/VersionEx.h b/src/VersionEx.h
index b1f543875..1bb7524fd 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -7,8 +7,8 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
-#define VERSION_REV 526
-#define VERSION_BUILD 1730
+#define VERSION_REV 527
+#define VERSION_BUILD 1731
 #define SCINTILLA_VER 415+
 #define ONIGMO_REGEX_VER 6.2.0
 #define VERSION_PATCH RC