diff --git a/Version.ps1 b/Version.ps1
index a7f945ef2..ebcd5abda 100644
--- a/Version.ps1
+++ b/Version.ps1
@@ -39,21 +39,23 @@ try
 	$Build = [int](Get-Content "Versions\build.txt")
 	if (!$Build) { $Build = 0 }
 	$LastBuildDay = [string](Get-Content "Versions\day.txt")
-	if ($LastBuildDay -ne "$Revis") {
-		$Build = 0  # reset
-		$Build | Set-Content "Versions\build.txt"
-		$Revis | Set-Content "Versions\day.txt"
-	}
 
 	$AppVeyorBuild = [int]($env:appveyor_build_number) # AppVeyor internal
 
 	if ($AppVeyorEnv) {
+		if ($LastBuildDay -ne "$Revis") {
+			$Revis | Set-Content "Versions\day.txt"
+			$Build = 1  # reset (AppVeyor)
+		}
 		$CommitID = ([string]($env:appveyor_repo_commit)).substring(0,8)
 	}
 	else {
+		if ($LastBuildDay -ne "$Revis") {
+			$Revis | Set-Content "Versions\day.txt"
+			$Build = 0  # reset (local build)
+		}
 		# locally: increase build number and persit it
 		$Build = $Build + 1
-		$Build | Set-Content "Versions\build.txt"
 		# locally: we have no commit ID, create an arificial one
 		$CommitID = [string](Get-Content "Versions\commit_id.txt")
 		if ($CommitID -eq "computername") {
@@ -64,6 +66,7 @@ try
 		}
 	}
 	if (!$CommitID) { $CommitID = "---" }
+	$Build | Set-Content "Versions\build.txt"
 
 	$CompleteVer = "$Major.$Minor.$Revis.$Build"
 	DebugOutput("Notepad3 version number: 'v$CompleteVer $VerPatch'")
diff --git a/Versions/day.txt b/Versions/day.txt
index c34a8046f..a817176f4 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-215
+216
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 5cd1afce5..7d2703e62 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.215.1"
+    version="5.20.216.1"
     type="win32"
   />
   <description>Notepad3 RC1</description>
diff --git a/src/TypeDefs.h b/src/TypeDefs.h
index 98c0db42e..47c760b36 100644
--- a/src/TypeDefs.h
+++ b/src/TypeDefs.h
@@ -655,8 +655,10 @@ typedef struct _themeFiles
 
 #define NOTEPAD3_MODULE_DIR_ENV_VAR  L"NOTEPAD3MODULEDIR"
 
-//#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : (SCVS_RECTANGULARSELECTION | SCVS_NOWRAPLINESTART | SCVS_USERACCESSIBLE))
-#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : (SCVS_RECTANGULARSELECTION | SCVS_NOWRAPLINESTART))
+//~#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : (SCVS_RECTANGULARSELECTION | SCVS_NOWRAPLINESTART | SCVS_USERACCESSIBLE))
+//~#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : (SCVS_RECTANGULARSELECTION | SCVS_NOWRAPLINESTART))
+// don't use 'SCVS_NOWRAPLINESTART'
+#define NP3_VIRTUAL_SPACE_ACCESS_OPTIONS (Settings2.DenyVirtualSpaceAccess ? SCVS_NONE : SCVS_RECTANGULARSELECTION)
 
 // from <wininet.h>
 #define INTERNET_MAX_PATH_LENGTH        2048
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 04584c2b9..2b6c1f9b1 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 215
+#define VERSION_REV 216
 #define VERSION_BUILD 1
 #define SCINTILLA_VER 430
 #define ONIGURUMA_REGEX_VER 6.9.4