diff --git a/package/src/main/scripts/console.bat b/package/src/main/scripts/console.bat
index 77e9888841..09d6430604 100755
--- a/package/src/main/scripts/console.bat
+++ b/package/src/main/scripts/console.bat
@@ -14,6 +14,7 @@
 @REM limitations under the License.
 @REM
 
+@echo off
 @setlocal
 
 set ERROR_CODE=0
@@ -55,27 +56,20 @@ echo ARCADEDB home directory      = %ARCADEDB_HOME%
 rem Always change directory to HOME directory
 cd /d %ARCADEDB_HOME%
 
-rem Get remaining unshifted command line arguments and save them in the
-set CMD_LINE_ARGS=
+rem Get full command line arguments for the batch file
+set CMD_LINE_ARGS=%*
 
-:setArgs
-if ""%1""=="""" goto doneSetArgs
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto setArgs
-
-:doneSetArgs
 set JAVA_OPTS_SCRIPT=-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF8 -Dpolyglot.engine.WarnInterpreterOnly=false
 
 "%JAVACMD%" ^
-  -client ^
-  %JAVA_OPTS% ^
-  %JAVA_OPTS_SCRIPT% ^
-  %ARCADEDB_OPTS_MEMORY% ^
-  %ARCADEDB_JMX% ^
-  %ARCADEDB_SETTINGS% ^
-  -cp "%ARCADEDB_HOME%\lib\*" ^
-  %CMD_LINE_ARGS% ^
-  com.arcadedb.console.Console
+ -client ^
+ %JAVA_OPTS% ^
+ %JAVA_OPTS_SCRIPT% ^
+ %ARCADEDB_OPTS_MEMORY% ^
+ %ARCADEDB_JMX% ^
+ %ARCADEDB_SETTINGS% ^
+ %CMD_LINE_ARGS% ^
+ -cp "%ARCADEDB_HOME%\lib\*" ^
+ com.arcadedb.console.Console
 
 :end
diff --git a/package/src/main/scripts/server.bat b/package/src/main/scripts/server.bat
index 4811211479..2f101d4ad8 100755
--- a/package/src/main/scripts/server.bat
+++ b/package/src/main/scripts/server.bat
@@ -70,11 +70,8 @@ cd /d %ARCADEDB_HOME%
 rem Get remaining unshifted command line arguments and save them in the
 set CMD_LINE_ARGS=
 
-:setArgs
-if ""%1""=="""" goto doneSetArgs
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto setArgs
+:rem Get full command line arguments for the batch file
+set CMD_LINE_ARGS=%*
 
 :doneSetArgs
 
@@ -90,13 +87,14 @@ rem -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044
 rem AND ATTACH TO THE CURRENT HOST, PORT 1044
 
 "%JAVACMD%" ^
-  -server %JAVA_OPTS% ^
-  %ARCADEDB_OPTS_MEMORY% ^
-  %JAVA_OPTS_SCRIPT% ^
-  %ARCADEDB_JMX% ^
-  %ARCADEDB_SETTINGS% ^
-  -cp "%ARCADEDB_HOME%\lib\*" ^
-  %CMD_LINE_ARGS% com.arcadedb.server.ArcadeDBServer
+ -server %JAVA_OPTS% ^
+ %ARCADEDB_OPTS_MEMORY% ^
+ %JAVA_OPTS_SCRIPT% ^
+ %ARCADEDB_JMX% ^
+ %ARCADEDB_SETTINGS% ^
+ %CMD_LINE_ARGS% ^
+ -cp "%ARCADEDB_HOME%\lib\*" ^
+ com.arcadedb.server.ArcadeDBServer
 
 if ERRORLEVEL 1 goto error
 goto end