diff --git a/bin/openiec61850-console-client b/bin/openiec61850-console-client
index 8e47a71..1fe5b0a 100755
--- a/bin/openiec61850-console-client
+++ b/bin/openiec61850-console-client
@@ -25,12 +25,14 @@ cd "$SAVED" >/dev/null
 
 CLASSPATH=$(JARS=("$APP_HOME"/"$JARS_LOCATION"/*.jar); IFS=:; echo "${JARS[*]}")
 
-for i in "$@"; do 
+PARAMS=( )
+SYSPROPS=( )
+for i in "$@"; do
     if [[ $i == -D* ]]; then
-	    SYSPROPS="$SYSPROPS $i";
+	    SYSPROPS+=( "$i" )
     else
-	    PARAMS="$PARAMS $i";
+	    PARAMS+=( "$i" )
     fi
 done
 
-java $SYSPROPS -cp $CLASSPATH $MAIN_CLASS $PARAMS
+java "${SYSPROPS[@]}" -cp "$CLASSPATH" $MAIN_CLASS "${PARAMS[@]}"
diff --git a/bin/openiec61850-console-server b/bin/openiec61850-console-server
index 32851fc..914c9da 100755
--- a/bin/openiec61850-console-server
+++ b/bin/openiec61850-console-server
@@ -24,12 +24,14 @@ cd "$SAVED" >/dev/null
 
 CLASSPATH=$(JARS=("$APP_HOME"/"$JARS_LOCATION"/*.jar); IFS=:; echo "${JARS[*]}")
 
-for i in "$@"; do 
+PARAMS=( )
+SYSPROPS=( )
+for i in "$@"; do
     if [[ $i == -D* ]]; then
-	    SYSPROPS="$SYSPROPS $i";
+	    SYSPROPS+=( "$i" )
     else
-	    PARAMS="$PARAMS $i";
+	    PARAMS+=( "$i" )
     fi
 done
 
-java $SYSPROPS -cp $CLASSPATH $MAIN_CLASS $PARAMS
+java "${SYSPROPS[@]}" -cp "$CLASSPATH" $MAIN_CLASS "${PARAMS[@]}"
diff --git a/bin/openiec61850-gui-client b/bin/openiec61850-gui-client
index 95ae155..30f1943 100755
--- a/bin/openiec61850-gui-client
+++ b/bin/openiec61850-gui-client
@@ -25,12 +25,14 @@ cd "$SAVED" >/dev/null
 
 CLASSPATH=$(JARS=("$APP_HOME"/"$JARS_LOCATION"/*.jar); IFS=:; echo "${JARS[*]}")
 
-for i in "$@"; do 
+PARAMS=( )
+SYSPROPS=( )
+for i in "$@"; do
     if [[ $i == -D* ]]; then
-	    SYSPROPS="$SYSPROPS $i";
+	    SYSPROPS+=( "$i" )
     else
-	    PARAMS="$PARAMS $i";
+	    PARAMS+=( "$i" )
     fi
 done
 
-java $SYSPROPS -cp $CLASSPATH $MAIN_CLASS $PARAMS
+java "${SYSPROPS[@]}" -cp "$CLASSPATH" $MAIN_CLASS "${PARAMS[@]}"