diff --git a/src/engine/config_toolset.bat b/src/engine/config_toolset.bat
index 01bda383e..12237058a 100644
--- a/src/engine/config_toolset.bat
+++ b/src/engine/config_toolset.bat
@@ -1,4 +1,3 @@
-FOR /?
 @ECHO OFF
 
 REM ~ Copyright 2002-2018 Rene Rivera.
@@ -227,7 +226,7 @@ if not defined CXX ( set "CXX=g++" )
 if not "_%BOOST_JAM_TOOLSET_ROOT%_" == "__" (
     set "PATH=%BOOST_JAM_TOOLSET_ROOT%bin;%PATH%"
     )
-for /F "delims=" %%P in (%CXX%) do SET PATH=%PATH%;%~dpP
+for /F "delims=" %%I in ("%CXX%") do set "PATH=%PATH%;%%~dpI"
 set "BOOST_JAM_CXX=%CXX% -x c++ -std=c++11 -s -O3"
 set "BOOST_JAM_OPT_JAM=-o b2.exe"
 set "_known_=1"