diff --git a/Versions/build.txt b/Versions/build.txt
index 06415b870..2794bbe06 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1437
+1458
diff --git a/np3portableapp/_buildname.txt b/np3portableapp/_buildname.txt
index 2bb514739..2720cb04d 100644
--- a/np3portableapp/_buildname.txt
+++ b/np3portableapp/_buildname.txt
@@ -1 +1 @@
-"Dev_Test_2" 
+"RC2" 
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 30a1fe2cd..2829e59a8 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,8 +3,8 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.18.1115.1437"
+    version="5.19.102.1458"
     type="win32"
   />
-  <description>Notepad3 Dev_Test_2</description>
+  <description>Notepad3 RC2</description>
 </assembly>
diff --git a/scionigmo/OnigmoRegExEngine.cxx b/scionigmo/OnigmoRegExEngine.cxx
index 4cba9745e..77fac4b6d 100644
--- a/scionigmo/OnigmoRegExEngine.cxx
+++ b/scionigmo/OnigmoRegExEngine.cxx
@@ -306,8 +306,10 @@ Sci::Position OnigmoRegExEngine::FindText(Document* doc, Sci::Position minPos, S
 
   if ((result >= 0) && (rangeBegPtr <= rangeEndPtr)) 
   {
-    m_MatchPos = SciPos(result); //SciPos(m_Region.beg[0]);
-    m_MatchLen = SciPos(m_Region.end[0] - result);
+    //~m_MatchPos = SciPos(result); //
+    m_MatchPos = SciPos(m_Region.beg[0]);
+    //~m_MatchLen = SciPos(m_Region.end[0] - result);
+    m_MatchLen = SciPos(m_Region.end[0] - m_Region.beg[0]);
   }
 
   //NOTE: potential 64-bit-size issue at interface here:
diff --git a/src/VersionEx.h b/src/VersionEx.h
index ea08e2099..a8272f8b5 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -5,9 +5,9 @@
 // //////////////////////////////////////////////////////////
 #define APPNAME "Notepad3"
 #define VERSION_MAJOR 5
-#define VERSION_MINOR 18
-#define VERSION_REV 1115
-#define VERSION_BUILD 1437
+#define VERSION_MINOR 19
+#define VERSION_REV 102
+#define VERSION_BUILD 1458
 #define SCINTILLA_VER 412
 #define ONIGMO_REGEX_VER 6.1.3
-#define VERSION_PATCH "Dev_Test_2"
+#define VERSION_PATCH "RC2"