diff --git a/em++.bat b/em++.bat
index 068b9e7dc6e7c..4f495e4781d5c 100644
--- a/em++.bat
+++ b/em++.bat
@@ -1,5 +1,5 @@
 :: Entry point for running python scripts on windows systems.
-:: To modify this file, edit `tools/run_python.bat` and then run
+:: To modify this file, edit `tools/run_python_compiler.bat` and then run
 :: `tools/create_entry_points.py`
 
 @setlocal
@@ -8,11 +8,12 @@
   set EM_PY=python
 )
 
+@set ARGS=%*
 @if "%_EMCC_CCACHE%"=="" (
   :: Do regular invocation of em++.py compiler
-  "%EM_PY%" "%~dp0\%~n0.py" %*
+  "%EM_PY%" "%~dp0\%~n0.py" %ARGS:)=^)%
 ) else (
   :: Remove the ccache env. var, invoke ccache and re-enter this script to take the above branch.
   set _EMCC_CCACHE=
-  ccache "%~dp0\%~n0.bat" %*
+  ccache "%~dp0\%~n0.bat" %ARGS:)=^)%
 )
diff --git a/emcc.bat b/emcc.bat
index 068b9e7dc6e7c..4f495e4781d5c 100644
--- a/emcc.bat
+++ b/emcc.bat
@@ -1,5 +1,5 @@
 :: Entry point for running python scripts on windows systems.
-:: To modify this file, edit `tools/run_python.bat` and then run
+:: To modify this file, edit `tools/run_python_compiler.bat` and then run
 :: `tools/create_entry_points.py`
 
 @setlocal
@@ -8,11 +8,12 @@
   set EM_PY=python
 )
 
+@set ARGS=%*
 @if "%_EMCC_CCACHE%"=="" (
   :: Do regular invocation of em++.py compiler
-  "%EM_PY%" "%~dp0\%~n0.py" %*
+  "%EM_PY%" "%~dp0\%~n0.py" %ARGS:)=^)%
 ) else (
   :: Remove the ccache env. var, invoke ccache and re-enter this script to take the above branch.
   set _EMCC_CCACHE=
-  ccache "%~dp0\%~n0.bat" %*
+  ccache "%~dp0\%~n0.bat" %ARGS:)=^)%
 )
diff --git a/tools/run_python_compiler.bat b/tools/run_python_compiler.bat
index 068b9e7dc6e7c..4f495e4781d5c 100644
--- a/tools/run_python_compiler.bat
+++ b/tools/run_python_compiler.bat
@@ -1,5 +1,5 @@
 :: Entry point for running python scripts on windows systems.
-:: To modify this file, edit `tools/run_python.bat` and then run
+:: To modify this file, edit `tools/run_python_compiler.bat` and then run
 :: `tools/create_entry_points.py`
 
 @setlocal
@@ -8,11 +8,12 @@
   set EM_PY=python
 )
 
+@set ARGS=%*
 @if "%_EMCC_CCACHE%"=="" (
   :: Do regular invocation of em++.py compiler
-  "%EM_PY%" "%~dp0\%~n0.py" %*
+  "%EM_PY%" "%~dp0\%~n0.py" %ARGS:)=^)%
 ) else (
   :: Remove the ccache env. var, invoke ccache and re-enter this script to take the above branch.
   set _EMCC_CCACHE=
-  ccache "%~dp0\%~n0.bat" %*
+  ccache "%~dp0\%~n0.bat" %ARGS:)=^)%
 )