diff --git a/Pilz.Updating.Administration.GUI/General.cs b/Pilz.Updating.Administration.GUI/General.cs
index 1fc103a..88cfb6a 100644
--- a/Pilz.Updating.Administration.GUI/General.cs
+++ b/Pilz.Updating.Administration.GUI/General.cs
@@ -19,7 +19,7 @@ namespace Pilz.Updating.Administration.GUI
             get
             {
                 if (string.IsNullOrEmpty(myAppPath))
-                    Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+                    Path.GetDirectoryName(IO.Extensions.GetExecutablePath());
                 return myAppPath;
             }
         }
diff --git a/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj b/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj
index 2319cbf..9741f26 100644
--- a/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj
+++ b/Pilz.Updating.Administration.GUI/Pilz.Updating.Administration.GUI.csproj
@@ -49,6 +49,7 @@
     <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
     <PackageReference Include="Pilz.Cryptography" Version="1.2023.1005.1121" />
+    <PackageReference Include="Pilz.IO" Version="1.2023.914.856" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="UI.for.WinForms.AllControls.Net60">
diff --git a/Pilz.Updating.UpdateInstaller/General.cs b/Pilz.Updating.UpdateInstaller/General.cs
index 17cd0f3..56075ea 100644
--- a/Pilz.Updating.UpdateInstaller/General.cs
+++ b/Pilz.Updating.UpdateInstaller/General.cs
@@ -13,7 +13,7 @@ namespace Pilz.Updating.UpdateInstaller
             {
                 if (string.IsNullOrEmpty(p))
                 {
-                    p = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+                    p = Path.GetDirectoryName(IO.Extensions.GetExecutablePath());
                 }
 
                 return p;
diff --git a/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj b/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj
index 035a4d2..1e04123 100644
--- a/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj
+++ b/Pilz.Updating.UpdateInstaller/Pilz.Updating.UpdateInstaller.csproj
@@ -47,6 +47,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
+    <PackageReference Include="Pilz.IO" Version="1.2023.914.856" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />