diff --git a/Versions/build.txt b/Versions/build.txt
index 82a96596d..db88a8627 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2249
+2250
diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt
index 3461eaac5..ee7531390 100644
--- a/np3portableapp/_buildname.txt
+++ b/np3portableapp/_buildname.txt
@@ -1 +1 @@
-"RC2"
+"RC"
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index b24ec3835..378f64896 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,8 +3,8 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.611.2249"
+    version="5.19.611.2250"
     type="win32"
   />
-  <description>Notepad3 RC2</description>
+  <description>Notepad3 RC</description>
 </assembly>
diff --git a/src/Styles.c b/src/Styles.c
index fe7bdae9e..163d9cf20 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -902,18 +902,20 @@ void Style_SetLexerSpecificProperties(const int lexerId)
 static inline bool _IsItemInStyleString(LPCWSTR lpszStyleStrg, LPCWSTR item)
 {
   LPCWSTR pFound = StrStrI(lpszStyleStrg, item);
-  if (pFound) {
-    const WCHAR pre = (pFound == lpszStyleStrg) ? L' ' : pFound[-1];
+  while (pFound) {
+    WCHAR const pre = (pFound == lpszStyleStrg) ? L' ' : pFound[-1];
     if ((pre == L' ') || (pre == L';')) {
-      const WCHAR end = pFound[lstrlen(item)];
+      WCHAR const end = pFound[StringCchLenW(item, 0)];
       if ((end == L'\0') || (end == L' ') || (end == L';')) {
         return true;
       }
     }
+    pFound = StrStrI(pFound + 1, item);
   }
   return false;
 }
 
+
 //=============================================================================
 //
 //  Style_SetLexer()
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 6c08dc47a..25fd8d5f8 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
 #define VERSION_REV 611
-#define VERSION_BUILD 2249
+#define VERSION_BUILD 2250
 #define SCINTILLA_VER 416
 #define ONIGMO_REGEX_VER 6.2.0
-#define VERSION_PATCH RC2
+#define VERSION_PATCH RC