diff --git a/sack b/sack
index 9f2fa45..87cbfa5 100755
--- a/sack
+++ b/sack
@@ -300,7 +300,7 @@ renameprofile() {
 }
 
 setflags() {
-    sack__new_flags=$@
+    sack__new_flags="$@"
     # Read the current profile directly from the config file to avoid sync issues
     sack__current_profile_raw=$(cat $sack__config_path | grep -A 4 "# sack__beacon_tag_current_profile BEGIN")
 
@@ -348,7 +348,7 @@ setflags() {
 }
 
 setdirectory() {
-    sack__new_directories=$@
+    sack__new_directories="$@"
 
     # Validate the list of all directories passed in
     for sack__new_directory in $sack__new_directories
@@ -524,13 +524,13 @@ elif [[ "$sack__option" == "-rp" || "$sack__option" == "--renameprofile" ]]; the
 # Set new preset flags for current profile
 elif [[ "$sack__option" == "-sf" || "$sack__option" == "--setflags" ]]; then
     shift
-    setflags $@
+    setflags "$@"
     echo ""
     exit 0
 # Set new preset search directory for current profile
 elif [[ "$sack__option" == "-sd" || "$sack__option" == "--setdirectory" ]]; then
     shift
-    setdirectory $@
+    setdirectory "$@"
     echo ""
     exit 0
 # Add a new profile