diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index bf63d832bf2..fb4592ccc58 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -102,6 +102,7 @@ Guidelines for modifications:
 * Miguel Alonso Jr
 * Mingyu Lee
 * Muhong Guo
+* Narendra Dahile
 * Neel Anand Jawale
 * Nicola Loi
 * Norbert Cygiert
diff --git a/isaaclab.bat b/isaaclab.bat
index 0a6cd9f7361..f47364e00b3 100644
--- a/isaaclab.bat
+++ b/isaaclab.bat
@@ -511,14 +511,8 @@ if "%arg%"=="-i" (
     call :extract_python_exe
     echo [INFO] Using python from: !python_exe!
     REM Loop through all arguments - mimic shift
-    set "allArgs="
-    for %%a in (%*) do (
-        REM Append each argument to the variable, skip the first one
-        if defined skip (
-            set "allArgs=!allArgs! %%a"
-        ) else (
-            set "skip=1"
-        )
+    for /f "tokens=1,* delims= " %%a in ("%*") do (
+        set "allArgs=%%b"
     )
     call !python_exe! !allArgs!
     goto :end
@@ -527,14 +521,8 @@ if "%arg%"=="-i" (
     call :extract_python_exe
     echo [INFO] Using python from: !python_exe!
     REM Loop through all arguments - mimic shift
-    set "allArgs="
-    for %%a in (%*) do (
-        REM Append each argument to the variable, skip the first one
-        if defined skip (
-            set "allArgs=!allArgs! %%a"
-        ) else (
-            set "skip=1"
-        )
+    for /f "tokens=1,* delims= " %%a in ("%*") do (
+        set "allArgs=%%b"
     )
     call !python_exe! !allArgs!
     goto :end