diff --git a/implementations/Crafter.Build-Project.cpp b/implementations/Crafter.Build-Project.cpp
index 8de5b71..a88a6e8 100644
--- a/implementations/Crafter.Build-Project.cpp
+++ b/implementations/Crafter.Build-Project.cpp
@@ -250,7 +250,7 @@ namespace Crafter {
         std::string command = std::format("clang++ --target={} -march={} -mtune={} -std={} -D CRAFTER_BUILD_CONFIGURATION_TARGET_{} -fprebuilt-module-path={}", config.target, config.march, config.march, config.standard, editedTarget, (exeDir/config.target).string());
         #endif
         #if defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc) || defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32)
-        std::string command = std::format("{}\\clang-cl.exe /EHsc --target={} -march={} -mtune={} /std:{} /D CRAFTER_BUILD_CONFIGURATION_TARGET_{} -fprebuilt-module-path={}", clangClDir, config.target, config.march, config.march, config.standard, editedTarget, (exeDir/config.target).string());
+        std::string command = std::format("\"{}\\clang-cl.exe\" /EHsc --target={} -march={} -mtune={} /std:{} /D CRAFTER_BUILD_CONFIGURATION_TARGET_{} -fprebuilt-module-path={}", clangClDir, config.target, config.march, config.march, config.standard, editedTarget, (exeDir/config.target).string());
         #endif
 
         if(config.target == "wasm32-wasi") {
@@ -470,7 +470,7 @@ namespace Crafter {
                     libPath += std::format(" /LIBPATH:{}", lib);
                 }
 
-                buildResult.errors = RunCommand(std::format("link {} {} .\\build\\std.o msvcrt.lib kernel32.lib user32.lib /OUT:{}.exe", libPath, files, (binDir/outputName).string()));
+                buildResult.errors = RunCommand(std::format("\"{}link.exe\" {} {} .\\build\\std.o msvcrt.lib kernel32.lib user32.lib /OUT:{}.exe", clDir libPath, files, (binDir/outputName).string()));
                 #endif
             } else if(config.type == CRAFTER_CONFIGURATION_TYPE_LIBRARY) {
                 #ifdef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu
@@ -478,7 +478,7 @@ namespace Crafter {
                 #endif
 
                 #if defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_windows_msvc) || defined(CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_w64_mingw32)
-                RunCommandIgnore(std::format("lib {} /OUT:{}.lib", files, (binDir/fs::path(outputName)).string()));
+                RunCommandIgnore(std::format("\"{}lib.exe\" {} /OUT:{}.lib", clDir, files, (binDir/fs::path(outputName)).string()));
                 #endif
             } else {
                 #ifdef CRAFTER_BUILD_CONFIGURATION_TARGET_x86_64_pc_linux_gnu