diff --git a/bench b/bench
index 8afc0b34..b0184fc5 100755
--- a/bench
+++ b/bench
@@ -4,11 +4,10 @@ if [[ $# -eq 0 ]]; then
     docker exec -it frappe bash
 elif [ "$1" == 'init' ]; then
     docker exec -it -u root frappe bash -c "cd /home/frappe && chown -R frappe:frappe ./*"
-    docker exec -i frappe bash -c "bench init frappe-bench --ignore-exist --skip-redis-config-generation"
+    docker exec -i frappe bash -c "cd .. && bench init frappe-bench --ignore-exist --skip-redis-config-generation"
     docker exec -i frappe bash -c "mv Procfile_docker Procfile && mv sites/common_site_config_docker.json sites/common_site_config.json && bench set-mariadb-host mariadb"
-    docker exec -i frappe bash -c "cd /home/frappe/frappe-bench/"
 elif [ "$1" == 'setup' ] && [ "$2" == 'docker' ]; then
-    if [ "$3" == 'swarm' ]; then
+    if [ "$3" == '--swarm-mode' ]; then
         echo "Docker swarm mode is not currently supported"
     else
         docker-compose up -d
@@ -19,6 +18,6 @@ elif [ "$1" == '-c' ]; then
     shift
     docker exec -i -u "$user" frappe bash -c "$@"
 else
-    IFS=
+    IFS=" "
     docker exec -i frappe bash -c "bench $*"
 fi
\ No newline at end of file