diff --git a/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.Tools.targets b/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.Tools.targets
index 0d4a199..407ebd9 100644
--- a/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.Tools.targets
+++ b/src/dscom.build/dSPACE.Runtime.InteropServices.BuildTasks.Tools.targets
@@ -52,21 +52,23 @@
       <_DsComArguments> $(_DsComArguments) $(_DsComAssemblyReferences)</_DsComArguments>
       <_DsComArguments> $(_DsComArguments) $(_DsComTypeLibraryReferences)</_DsComArguments>
       <_DsComArguments> $(_DsComArguments) $(_DsComTypeLibraryReferencePaths)</_DsComArguments>
-      <_DsComArguments> $(_DsComArguments) $(_DsComExportTypeLibraryAssemblyFile)</_DsComArguments>
+      <_DsComArguments> $(_DsComArguments) "$(_DsComExportTypeLibraryAssemblyFile)"</_DsComArguments>
       <_DsComArguments> $(_DsComArguments) $(_DsComAliasNames)</_DsComArguments>
       <_DsComArguments Condition="'$(DsComOverideLibraryName)' != ''"> $(_DsComArguments) --overridename "$(DsComOverideLibraryName)"</_DsComArguments>
       <_DsComArguments> $(_DsComArguments) --out "$(_DsComExportTypeLibraryTargetFile)"</_DsComArguments>
+	    <_DsComWorkingDir>$(OutDir)</_DsComWorkingDir> 
+	    <_DsComWorkingDir Condition="$(_DsComWorkingDir) == ''">$(OutputPath)</_DsComWorkingDir> 
     </PropertyGroup>
     
     <Message Importance="High" Text="Calling dscom.exe to export type library" />
     <Message Importance="Low" Text="Using arguments '$(_DsComArguments)' to call dscom" />
     
-    <Exec Command="$(_DsComToolsFileDir)dscom.exe $(_DsComArguments)"
+    <Exec Command='"$(_DsComToolsFileDir)dscom.exe" $(_DsComArguments)'
           ConsoleToMsBuild="true" 
           StdErrEncoding="UTF-8"
           StdOutEncoding="UTF-8"
           IgnoreExitCode="false"
-          WorkingDirectory="$(OutputPath)" />
+          WorkingDirectory="$(_DsComWorkingDir)" />
 
     <Warning Code="DSCOM001" Text="Could not find the type library at the following location: '$(_DsComExportTypeLibraryTargetFile)'" Condition="!Exists('$(_DsComExportTypeLibraryTargetFile)')" />
   </Target>