diff --git a/bin/openiec61850-console-client b/bin/openiec61850-console-client
index 8181d7e..8e47a71 100755
--- a/bin/openiec61850-console-client
+++ b/bin/openiec61850-console-client
@@ -25,7 +25,7 @@ cd "$SAVED" >/dev/null
 
 CLASSPATH=$(JARS=("$APP_HOME"/"$JARS_LOCATION"/*.jar); IFS=:; echo "${JARS[*]}")
 
-for i in $@; do 
+for i in "$@"; do 
     if [[ $i == -D* ]]; then
 	    SYSPROPS="$SYSPROPS $i";
     else
diff --git a/bin/openiec61850-console-server b/bin/openiec61850-console-server
index 3fa4b99..32851fc 100755
--- a/bin/openiec61850-console-server
+++ b/bin/openiec61850-console-server
@@ -24,7 +24,7 @@ cd "$SAVED" >/dev/null
 
 CLASSPATH=$(JARS=("$APP_HOME"/"$JARS_LOCATION"/*.jar); IFS=:; echo "${JARS[*]}")
 
-for i in $@; do 
+for i in "$@"; do 
     if [[ $i == -D* ]]; then
 	    SYSPROPS="$SYSPROPS $i";
     else
diff --git a/bin/openiec61850-gui-client b/bin/openiec61850-gui-client
index b4ccec7..95ae155 100755
--- a/bin/openiec61850-gui-client
+++ b/bin/openiec61850-gui-client
@@ -25,7 +25,7 @@ cd "$SAVED" >/dev/null
 
 CLASSPATH=$(JARS=("$APP_HOME"/"$JARS_LOCATION"/*.jar); IFS=:; echo "${JARS[*]}")
 
-for i in $@; do 
+for i in "$@"; do 
     if [[ $i == -D* ]]; then
 	    SYSPROPS="$SYSPROPS $i";
     else