diff --git a/heavy_script.sh b/heavy_script.sh
index f2724dbb..c5d1603d 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="$*" 
+ARGS="$@" 
 SCRIPT=$(readlink -f "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
 SCRIPTNAME="$0"
@@ -21,7 +21,7 @@ git fetch
     git checkout $BRANCH
     git pull --force
     echo "Running the new version..."
-    bash "$SCRIPTNAME" "${ARGS//\ \-\-self\-update\ }"
+    exec bash "$SCRIPTNAME" "${ARGS//\ \-\-self\-update\ }"
 
     # Now exit this old instance
     exit 1