diff --git a/heavy_script.sh b/heavy_script.sh
index 6eb77eb7..edbca1b6 100644
--- a/heavy_script.sh
+++ b/heavy_script.sh
@@ -4,7 +4,7 @@
 [[ -z "$*" || "-" == "$*" || "--" == "$*"  ]] && echo "This script requires an argument, use --help for help" && exit
 
 
-ARGS=$(echo "$@" | sed -E 's/[[:space:]]?--self-update[[:space:]]?//g')
+ARGS=$(echo "$*" | sed -E 's/[[:space:]]?--self-update[[:space:]]?//g')
 
 SCRIPT=$(readlink -f "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
@@ -22,7 +22,7 @@ git fetch
     git checkout $BRANCH
     git pull --force
     echo "Running the new version..."
-    exec bash "$SCRIPTNAME" ${ARGS[@]}
+    exec bash "$SCRIPTNAME" "$ARGS"
 
     # Now exit this old instance
     exit 1