diff --git a/BuildTools/UpdateVersionStamp/Program.cs b/BuildTools/UpdateVersionStamp/Program.cs
index 314c83871..8c9729468 100644
--- a/BuildTools/UpdateVersionStamp/Program.cs
+++ b/BuildTools/UpdateVersionStamp/Program.cs
@@ -92,8 +92,11 @@ namespace UpdateVersionStamp
             {
                 var re = FILEMAP[Path.GetFileName(p.File)];
                 var txt = File.ReadAllText(p.File);
-                var m = re.Match(txt).Groups["version"];
-                txt = txt.Substring(0, m.Index) + nv + txt.Substring(m.Index + m.Length);
+                //var m = re.Match(txt).Groups["version"];
+                txt = re.Replace(txt, (m) => {
+                    var t = m.Groups["version"];
+                    return m.Value.Replace(t.Value, nv);
+                });
                 File.WriteAllText(p.File, txt);
             }
 
diff --git a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj
index 386947a9e..11a16590c 100644
--- a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj
+++ b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj
@@ -27,7 +27,7 @@
     <OutputPath>bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
+    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />