diff --git a/run.sh b/run.sh
index 9d56283..8374f4d 100755
--- a/run.sh
+++ b/run.sh
@@ -38,10 +38,10 @@ main () {
     exit 0
   fi
 
-  chrdir="$(readlink -f "$1")"
+  chrdir=$(readlink -f "$1")
   chrcmd="${2:-/bin/bash}"
 
-  trap "clean $chrdir" EXIT
+  trap "clean \"$chrdir\"" EXIT
 
   setup "$chrdir"
   runcmd "$chrdir" "$chrcmd"
@@ -54,4 +54,4 @@ sourced () {
   return 1
 }
 
-sourced || main $@
+sourced || main "$@"