diff --git a/lib/command_line.sh b/lib/command_line.sh
index 117b486..f7ed905 100644
--- a/lib/command_line.sh
+++ b/lib/command_line.sh
@@ -36,7 +36,7 @@ read_commandline()
 		;;
 	    "-m"|"--module")
 		if [[ -z $MANUAL_MODULE_LIST ]]; then
-		    export MANUAL_MODULE_LIST=$2
+		    export MANUAL_MODULE_LIST="$2"
 		else
 		    prnt E "A module list have already been given!"
 		    prnt E "Commande line only tolerate one --module parameter."
@@ -166,7 +166,7 @@ process_commandline_and_vars()
     # Configure module list
     if [[ -n $MANUAL_MODULE_LIST ]]; then
 	prnt W "A manual module list will be used:"
-	export MODULE_LIST=${MANUAL_MODULE_LIST//,/ /g}
+	export MODULE_LIST=${MANUAL_MODULE_LIST//,/ }
         prnt m " * $MODULE_LIST"
     fi