diff --git a/pressure-vessel-wrap b/pressure-vessel-wrap
index cf786580a22f78eb060ab24f792b2ea1b5da548e..b5a585b8c7c530f13dd0c3704eccd34b45860945 100755
--- a/pressure-vessel-wrap
+++ b/pressure-vessel-wrap
@@ -228,6 +228,8 @@ if [ -z "$fake_home" ]; then
     fi
 fi
 
+set -- $bwrap_end_of_options "$@"
+
 # Because this is a shell script, we only have access to one array, which
 # is $@; so we need to build up the bwrap command line backwards, with
 # "wider" mount points like / coming after "narrower" mount points
@@ -358,6 +360,6 @@ if [ -n "$verbose" ]; then
     echo "$me: '$BWRAP $*'" >&2
 fi
 
-exec "$BWRAP" $bwrap_end_of_options "$@" || e=$?
+exec "$BWRAP" "$@" || e=$?
 echo "$me: failed to execute '$BWRAP $*': exec status $e" >&2
 exit "$e"