diff --git a/Directory.Build.props b/Directory.Build.props
index 234478b..88c4250 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
         <!-- Keep in sync with WS4WSetupScript.iss and VersionInfo.xml -->
-        <AssemblyVersion>2.1.3.0</AssemblyVersion>
-        <FileVersion>2.1.3.0</FileVersion>
-        <InformationalVersion>2.1.3.0</InformationalVersion>
+        <AssemblyVersion>2.1.4.0</AssemblyVersion>
+        <FileVersion>2.1.4.0</FileVersion>
+        <InformationalVersion>2.1.4.0</InformationalVersion>
         <Authors>Micah Morrison</Authors>
         <Product>WS4W</Product>
     </PropertyGroup>
diff --git a/Installer/WS4WSetupScript.iss b/Installer/WS4WSetupScript.iss
index 4082dff..dae45de 100644
--- a/Installer/WS4WSetupScript.iss
+++ b/Installer/WS4WSetupScript.iss
@@ -1,6 +1,6 @@
 #define MyAppNameOld "WireGuard Server For Windows"
 #define MyAppName "Wg Server for Windows"
-#define MyAppVersion "2.1.3"
+#define MyAppVersion "2.1.4"
 #define MyAppPublisher "Micah Morrison"
 #define MyAppURL "https://github.com/micahmo/WgServerforWindows"
 #define MyAppExeName "WgServerforWindows.exe"
diff --git a/WgServerforWindows/Models/NewNetIpAddressTaskSubCommand.cs b/WgServerforWindows/Models/NewNetIpAddressTaskSubCommand.cs
index f52f627..460a369 100644
--- a/WgServerforWindows/Models/NewNetIpAddressTaskSubCommand.cs
+++ b/WgServerforWindows/Models/NewNetIpAddressTaskSubCommand.cs
@@ -44,7 +44,7 @@ public void Resolve(string serverDataPath)
 
             // Create/update a Scheduled Task that sets the NetIPAddress on boot.
             TaskDefinition td = TaskService.Instance.NewTask();
-            td.Actions.Add(new ExecAction(Path.Combine(AppContext.BaseDirectory, "ws4w.exe"), $"{typeof(SetNetIpAddressCommand).GetVerb()} --{typeof(SetNetIpAddressCommand).GetOption(nameof(SetNetIpAddressCommand.ServerDataPath))} {serverDataPath ?? ServerConfigurationPrerequisite.ServerDataPath}"));
+            td.Actions.Add(new ExecAction(Path.Combine(AppContext.BaseDirectory, "ws4w.exe"), $"{typeof(SetNetIpAddressCommand).GetVerb()} --{typeof(SetNetIpAddressCommand).GetOption(nameof(SetNetIpAddressCommand.ServerDataPath))} \"{serverDataPath ?? ServerConfigurationPrerequisite.ServerDataPath}\""));
             td.Triggers.Add(new BootTrigger { Delay = GlobalAppSettings.Instance.BootTaskDelay + TimeSpan.FromSeconds(15) });
             TaskService.Instance.RootFolder.RegisterTaskDefinition(_netIpAddressTaskUniqueName, td, TaskCreation.CreateOrUpdate, "SYSTEM", null, TaskLogonType.ServiceAccount);
 
diff --git a/WireGuardServerForWindows/VersionInfo2.xml b/WireGuardServerForWindows/VersionInfo2.xml
index 79475c9..9257c26 100644
--- a/WireGuardServerForWindows/VersionInfo2.xml
+++ b/WireGuardServerForWindows/VersionInfo2.xml
@@ -2,12 +2,12 @@
 <!-- Things to update: Version, Date, Release Notes -->
 <AppUpdate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/micahmo/WgServerforWindows/master/WireGuardServerForWindows/AppUpdate.xsd">
-  <Version>2.1.3.0</Version>
-  <ReleaseDate>2025-03-05</ReleaseDate>
+  <Version>2.1.4.0</Version>
+  <ReleaseDate>2025-03-17</ReleaseDate>
   <!-- Default download -->
-  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.1.3/WS4WSetup-2.1.3.exe</DownloadLink>
-  <DownloadFileName>WS4WSetup-2.1.3.exe</DownloadFileName>
+  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.1.4/WS4WSetup-2.1.4.exe</DownloadLink>
+  <DownloadFileName>WS4WSetup-2.1.4.exe</DownloadFileName>
   <!-- Release notes -->
-  <VersionNotes> - Show warning if another process is listening on the configured WireGuard server port (#138 and #188)</VersionNotes>
+  <VersionNotes> - Fix issue where NAT boot task could fail (#139)</VersionNotes>
   <ReleaseNotes></ReleaseNotes>
 </AppUpdate>