diff --git a/xCAT-server/share/xcat/netboot/windows/genimage.cmd b/xCAT-server/share/xcat/netboot/windows/genimage.cmd
index 079167b37..000379156 100644
--- a/xCAT-server/share/xcat/netboot/windows/genimage.cmd
+++ b/xCAT-server/share/xcat/netboot/windows/genimage.cmd
@@ -57,8 +57,8 @@ copy %defdrive%\WinPE_%SUFFIX%\mount\Windows\Boot\EFI\bootmgfw.efi %defdrive%\Wi
 copy %defdrive%\WinPE_%SUFFIX%\mount\Windows\Boot\EFI\bootmgr.efi %defdrive%\WinPE_%SUFFIX%\media\Boot\bootmgr.efi
 copy %defdrive%\WinPE_%SUFFIX%\mount\Windows\Boot\PXE\bootmgr.exe %defdrive%\WinPE_%SUFFIX%\media\
 mkdir %defdrive%\WinPE_%SUFFIX%\media\dvd
-copy %oscdimg%\etfsboot.com %defdrive%\WinPE_%SUFFIX%\media\dvd
-copy %oscdimg%\efisys_noprompt.bin %defdrive%\WinPE_%SUFFIX%\media\dvd
+copy "%oscdimg%\etfsboot.com" %defdrive%\WinPE_%SUFFIX%\media\dvd
+copy "%oscdimg%\efisys_noprompt.bin" %defdrive%\WinPE_%SUFFIX%\media\dvd
 rem for /r %defdrive%\drivers %%d in (*.inf) do dism /image:%defdrive%\WinPE_%SUFFIX%\mount /add-driver /driver:%%d 
 if exist %defdrive%\drivers dism /image:%defdrive%\WinPE_%SUFFIX%\mount /add-driver /driver:%defdrive%\drivers /recurse
 dism /Unmount-Wim /commit /mountdir:%defdrive%\WinPE_%SUFFIX%\mount
diff --git a/xCAT-server/share/xcat/netboot/windows/startnet.cmd b/xCAT-server/share/xcat/netboot/windows/startnet.cmd
index 9073efb5c..91bd12a8f 100644
--- a/xCAT-server/share/xcat/netboot/windows/startnet.cmd
+++ b/xCAT-server/share/xcat/netboot/windows/startnet.cmd
@@ -8,10 +8,11 @@ echo [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TCPIP6\Parameters] >>
 echo "Dhcpv6DUID"=hex:00,04,%uuid:~0,2%,%uuid:~2,2%,%uuid:~4,2%,%uuid:~6,2%,%uuid:~9,2%,%uuid:~11,2%,%uuid:~14,2%,%uuid:~16,2%,%uuid:~19,2%,%uuid:~21,2%,%uuid:~24,2%,%uuid:~26,2%,%uuid:~28,2%,%uuid:~30,2%,%uuid:~32,2%,%uuid:~34,2% >> duiduuid.reg
 echo. >> duiduuid.reg
 regedit /s duiduuid.reg
-for /f "delims=" %a in ('wmic cdrom get drive ^| find ":") do @set optdrive=%a
-if [%optdrive%] == [] GOTO :netboot
-if not exist %optdrive%:\dvdboot.cmd GOTO :netboot
-%optdrive%:\dvdboot.cmd
+for /f "delims=" %%a in ('wmic cdrom get drive ^| find ":"') do set optdrive=%%a
+if not defined optdrive GOTO :netboot
+set optdrive=%optdrive: =%
+if not exist %optdrive%\dvdboot.cmd GOTO :netboot
+call %optdrive%\dvdboot.cmd
 goto :end
 :netboot
 wpeinit