diff --git a/NuGet/Get-BcNuGetPackageId.ps1 b/NuGet/Get-BcNuGetPackageId.ps1
index 9a70ffb7c..454c03922 100644
--- a/NuGet/Get-BcNuGetPackageId.ps1
+++ b/NuGet/Get-BcNuGetPackageId.ps1
@@ -45,9 +45,7 @@ function Get-BcNuGetPackageId {
     if ($nname -eq '') { throw "App name is invalid: '$name'" }
     if ($npublisher -eq '') { throw "App publisher is invalid: '$publisher'" }
 
-    $version = $version.Replace('..', '.').TrimEnd('.').Replace('.', '-');
-
-    $packageIdTemplate = $packageIdTemplate.replace('{id}',$id).replace('{publisher}',$npublisher).replace('{tag}',$tag).replace('{version}',$version)
+    $packageIdTemplate = $packageIdTemplate.replace('{id}',$id).replace('{publisher}',$npublisher).replace('{tag}',$tag).replace('{version}',$version.Replace('.', '-')).Replace('..', '.').TrimEnd('.')
     # Max. Length of NuGet Package Id is 100 - we shorten the name part of the id if it is too long
     $packageId = $packageIdTemplate.replace('{name}',$nname)
     if ($packageId.Length -ge 100) {
diff --git a/Version.txt b/Version.txt
index 874296f98..9ddb4717d 100644
--- a/Version.txt
+++ b/Version.txt
@@ -1 +1 @@
-6.0.21-dev
+6.0.21-dev