diff --git a/03_PrepareBoot.cmd b/03_PrepareBoot.cmd
index 498de78..6c3925c 100644
--- a/03_PrepareBoot.cmd
+++ b/03_PrepareBoot.cmd
@@ -20,7 +20,7 @@ for %%S in (
   finish-boot.cmd
 ) do (
   echo ########## calling [ %%S ] ##########
-  call %%S || exit /b
+  call %%S || ( cd .. ; exit /b )
   echo.
 )
 
diff --git a/04_PrepareImage.cmd b/04_PrepareImage.cmd
index 8a5c3db..122b30a 100644
--- a/04_PrepareImage.cmd
+++ b/04_PrepareImage.cmd
@@ -25,7 +25,7 @@ for %%S in (
   mount-image.cmd
 ) do (
   echo ########## calling [ %%S ] ##########
-  call %%S || exit /b
+  call %%S ||  ( cd .. ; exit /b )
   echo.
 )
 
@@ -36,7 +36,7 @@ if /I %ARG1% == /R (
 )
 
 echo ########## calling [ finish-image.cmd ] ##########
-call finish-image.cmd || exit /b
+call finish-image.cmd ||  ( cd .. ; exit /b )
 echo.
 
 echo checking for NTLite ...