diff --git a/dist/main/index.js b/dist/main/index.js
index 44d6d34..9f5c75e 100644
--- a/dist/main/index.js
+++ b/dist/main/index.js
@@ -1073,47 +1073,47 @@ class Packages {
                     // Clean up, no need for the file to lay around any more
                     yield (0, exec_1.exec)(`rm ${pkgFile}`);
                     for (const fpkg of pkg.Packages) {
-                        const pkgLPKFile = path.join(pkgFolder, pkg.PackageBaseDir.replace(/ /gi, '\ '), fpkg.RelativeFilePath.replace(/ /gi, '\ '), fpkg.PackageFile.replace(/ /gi, '\ '));
+                        const pkgLPKFile = path.join(pkgFolder, pkg.PackageBaseDir, fpkg.RelativeFilePath, fpkg.PackageFile);
                         switch (fpkg.PackageType) {
                             case 0:
                             case 1:
                                 // Making Lazarus aware of the package
                                 if (this._Platform != 'darwin') {
                                     core.info(`installPackages -- executing lazbuild --add-package "${pkgLPKFile}"`);
-                                    yield (0, exec_1.exec)(`lazbuild --add-package "${pkgLPKFile}"`);
+                                    yield (0, exec_1.exec)('lazbuild --add-package "' + pkgLPKFile + '"');
                                 }
                                 else {
                                     core.info(`installPackages -- executing lazbuild --ws=cocoa --add-package "${pkgLPKFile}"`);
-                                    yield (0, exec_1.exec)(`lazbuild --ws=cocoa --add-package "${pkgLPKFile}"`);
+                                    yield (0, exec_1.exec)('lazbuild --ws=cocoa --add-package "' + pkgLPKFile + '"');
                                 }
                                 // Compiling the package
                                 if (this._Platform != 'darwin') {
                                     core.info(`installPackages -- executing lazbuild "${pkgLPKFile}"`);
-                                    yield (0, exec_1.exec)(`lazbuild "${pkgLPKFile}"`);
+                                    yield (0, exec_1.exec)('lazbuild "' + pkgLPKFile + '"');
                                 }
                                 else {
                                     core.info(`installPackages -- executing lazbuild --ws=cocoa "${pkgLPKFile}"`);
-                                    yield (0, exec_1.exec)(`lazbuild --ws=cocoa "${pkgLPKFile}"`);
+                                    yield (0, exec_1.exec)('lazbuild --ws=cocoa "' + pkgLPKFile + '"');
                                 }
                                 break;
                             case 2:
                                 // Making Lazarus aware of the package
                                 if (this._Platform != 'darwin') {
                                     core.info(`installPackages -- executing lazbuild --add-package-link "${pkgLPKFile}"`);
-                                    yield (0, exec_1.exec)(`lazbuild --add-package-link "${pkgLPKFile}"`);
+                                    yield (0, exec_1.exec)('lazbuild --add-package-link "' + pkgLPKFile + '"');
                                 }
                                 else {
                                     core.info(`installPackages -- executing lazbuild --ws=cocoa --add-package-link "${pkgLPKFile}"`);
-                                    yield (0, exec_1.exec)(`lazbuild --ws=cocoa --add-package-link "${pkgLPKFile}"`);
+                                    yield (0, exec_1.exec)('lazbuild --ws=cocoa --add-package-link "' + pkgLPKFile + '"');
                                 }
                                 // Compiling the package
                                 if (this._Platform != 'darwin') {
                                     core.info(`installPackages -- executing lazbuild "${pkgLPKFile}"`);
-                                    yield (0, exec_1.exec)(`lazbuild "${pkgLPKFile}"`);
+                                    yield (0, exec_1.exec)('lazbuild "' + pkgLPKFile + '"');
                                 }
                                 else {
                                     core.info(`installPackages -- executing lazbuild --ws=cocoa "${pkgLPKFile}"`);
-                                    yield (0, exec_1.exec)(`lazbuild --ws=cocoa "${pkgLPKFile}"`);
+                                    yield (0, exec_1.exec)('lazbuild --ws=cocoa "' + pkgLPKFile + '"');
                                 }
                                 break;
                             default:
diff --git a/package.json b/package.json
index 5de131c..b01cf34 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "setup-lazarus",
-  "version": "3.2.11",
+  "version": "3.2.12",
   "description": "Set up your GitHub Actions workflow with a specific version of Lazarus",
   "main": "lib/main.js",
   "scripts": {
diff --git a/src/Packages.ts b/src/Packages.ts
index 23c381c..465061f 100644
--- a/src/Packages.ts
+++ b/src/Packages.ts
@@ -68,9 +68,9 @@ export class Packages {
 
                     const pkgLPKFile = path.join(
                         pkgFolder,
-                        pkg.PackageBaseDir.replace(/ /gi, '\ '),
-                        fpkg.RelativeFilePath.replace(/ /gi, '\ '),
-                        fpkg.PackageFile.replace(/ /gi, '\ ')
+                        pkg.PackageBaseDir,
+                        fpkg.RelativeFilePath,
+                        fpkg.PackageFile
                     );
 
                     switch (fpkg.PackageType) {
@@ -79,37 +79,37 @@ export class Packages {
                             // Making Lazarus aware of the package
                             if (this._Platform != 'darwin') {
                                 core.info(`installPackages -- executing lazbuild --add-package "${pkgLPKFile}"`);
-                                await exec(`lazbuild --add-package "${pkgLPKFile}"`);
+                                await exec('lazbuild --add-package "' + pkgLPKFile + '"');
                             } else {
                                 core.info(`installPackages -- executing lazbuild --ws=cocoa --add-package "${pkgLPKFile}"`);
-                                await exec(`lazbuild --ws=cocoa --add-package "${pkgLPKFile}"`);
+                                await exec('lazbuild --ws=cocoa --add-package "' + pkgLPKFile + '"');
                             }
 
                             // Compiling the package
                             if (this._Platform != 'darwin') {
                                 core.info(`installPackages -- executing lazbuild "${pkgLPKFile}"`);
-                                await exec(`lazbuild "${pkgLPKFile}"`);
+                                await exec('lazbuild "' + pkgLPKFile + '"');
                             } else {
                                 core.info(`installPackages -- executing lazbuild --ws=cocoa "${pkgLPKFile}"`);
-                                await exec(`lazbuild --ws=cocoa "${pkgLPKFile}"`);
+                                await exec('lazbuild --ws=cocoa "' + pkgLPKFile + '"');
                             }
                             break;
                         case 2:
                             // Making Lazarus aware of the package
                             if (this._Platform != 'darwin') {
                                 core.info(`installPackages -- executing lazbuild --add-package-link "${pkgLPKFile}"`);
-                                await exec(`lazbuild --add-package-link "${pkgLPKFile}"`);
+                                await exec('lazbuild --add-package-link "' + pkgLPKFile + '"');
                             } else {
                                 core.info(`installPackages -- executing lazbuild --ws=cocoa --add-package-link "${pkgLPKFile}"`);
-                                await exec(`lazbuild --ws=cocoa --add-package-link "${pkgLPKFile}"`);
+                                await exec('lazbuild --ws=cocoa --add-package-link "' + pkgLPKFile + '"');
                             }
                             // Compiling the package
                             if (this._Platform != 'darwin') {
                                 core.info(`installPackages -- executing lazbuild "${pkgLPKFile}"`);
-                                await exec(`lazbuild "${pkgLPKFile}"`);
+                                await exec('lazbuild "' + pkgLPKFile + '"');
                             } else {
                                 core.info(`installPackages -- executing lazbuild --ws=cocoa "${pkgLPKFile}"`);
-                                await exec(`lazbuild --ws=cocoa "${pkgLPKFile}"`);
+                                await exec('lazbuild --ws=cocoa "' + pkgLPKFile + '"');
                             }
                             break;
                         default:
diff --git a/src/constants.ts b/src/constants.ts
index 48a9674..4471aab 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -1 +1 @@
-export const _version = "3.2.11";
+export const _version = "3.2.12";