diff --git a/docker/g++ b/docker/g++
index ffdb9a14..7a4a0a4a 100755
--- a/docker/g++
+++ b/docker/g++
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-args=""
+declare -a args
 
 for i in "$@"
 do
-    if [[ $i != -march* ]]; then
-        args="$args $i"
+    if [[ "$i" != -march* ]]; then
+        args+=("$i")
     fi
 done
 
-/usr/bin/g++_real -march=nehalem $args
+/usr/bin/g++_real -march=nehalem "${args[@]}"
diff --git a/docker/gcc b/docker/gcc
index c2d09701..70fb53d5 100755
--- a/docker/gcc
+++ b/docker/gcc
@@ -1,12 +1,12 @@
 #!/bin/bash
 
-args=""
+declare -a args
 
 for i in "$@"
 do
-    if [[ $i != -march* ]]; then
-        args="$args $i"
+    if [[ "$i" != -march* ]]; then
+        args+=("$i")
     fi
 done
 
-/usr/bin/gcc_real -march=nehalem $args
+/usr/bin/gcc_real -march=nehalem "${args[@]}"