diff --git a/iop/scripts/genconfig_wrap.sh b/iop/scripts/genconfig_wrap.sh
index 9a4bc9e80..8c619f7ea 100755
--- a/iop/scripts/genconfig_wrap.sh
+++ b/iop/scripts/genconfig_wrap.sh
@@ -4,7 +4,7 @@
 function to_lowercase {
     local params=()
     for param in "$@"; do
-        params+=("$(echo "$param" | tr '[:upper:]' '[:lower:]')")
+        params+=("$(tr '[:upper:]' '[:lower:]' <<< "$param")")
     done
     echo "${params[@]}"
 }
@@ -19,16 +19,11 @@ function genconfig {
     if [[ ${args[0]} == -* ]]; then
       # Convert options for target script
       if [[ ${args[0]}  == "-b" || ${args[0]}  == "--boards" ]]; then
-        args=()
-        args[0]="-l"
-      elif [[ ${args[0]}  == "-c" || ${args[0]}  == "--clean" ]]; then
-        args=()
-        args[0]="-c"
+        args=("--list")
       fi
     fi
 
-    ${target_script} ${args[*]}
-
+    "${target_script}" "${args[@]}"
 }
 
 register_command "genconfig" "Generate configuration for board and customer"