diff --git a/07_MakeISOfromStick.cmd b/07_MakeISOfromStick.cmd
index 1a02026..389798e 100644
--- a/07_MakeISOfromStick.cmd
+++ b/07_MakeISOfromStick.cmd
@@ -1,7 +1,7 @@
 @echo off
 set OSCDPATH="%ProgramFiles(x86)%\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\amd64\Oscdimg"
 set OSLABEL=WIN10-AUTO
-set ISOFILE=c:\temp\%OSLABEL%.iso
+set ISOFILE=%SystemDrive%\temp\%OSLABEL%.iso
 
 IF %1.==. GOTO USAGE
 
@@ -12,7 +12,7 @@ echo.
 
 set USBDRIVE=%1
 
-if /I %USBDRIVE% == C: (
+if /I %USBDRIVE% == %SystemDrive% (
   echo ERROR: cannot use drive %USBDRIVE% !
   exit /b
 )