diff --git a/rebuild-wekan.sh b/rebuild-wekan.sh
index 26b0d717c..231720212 100755
--- a/rebuild-wekan.sh
+++ b/rebuild-wekan.sh
@@ -89,14 +89,9 @@ do
 		meteor npm install
 		meteor build .build --directory
 		rm -rf .build/bundle/programs/web.browser.legacy
-		pushd .build/bundle/programs/server
-		rm -rf node_modules
-                chmod u+w *.json
-		meteor npm install
-		cd node_modules/fibers
-		node build.js
+		(cd .build/bundle/programs/server && rm -rf node_modules && chmod u+w *.json && meteor npm install)
+                (cd .build/bundle/programs/server/node_modules/fibers && node build.js)
 		# Cleanup
-		popd
 		find . -type d -name '*-garbage*' | xargs rm -rf
 		find . -name '*phantom*' | xargs rm -rf
 		find . -name '.*.swp' | xargs rm -f