diff --git a/extend-bazaar/Allwclean b/extend-bazaar/Allwclean
index 2a5f12bfc..9a70cd98d 100755
--- a/extend-bazaar/Allwclean
+++ b/extend-bazaar/Allwclean
@@ -2,16 +2,18 @@
 cd ${0%/*} || exit 1    # run from this directory
 
 # Clean compilation in Fluid-Structure Interaction package
-cd FluidStructureInteraction/src/
-./Allwclean
-cd -
+(
+    cd FluidStructureInteraction/src/
+    ./Allwclean
+)
 
 # Clean compilation in cfMesh mesh generation package
-cd cfMesh-v1.0/
-wclean libso meshLibrary
-wclean all executables
-wclean all utilities
-cd -
+(
+    cd cfMesh-v1.0/
+    wclean libso meshLibrary
+    wclean all executables
+    wclean all utilities
+)
 
 #Clean makeAxialMesh
 wclean MakeAxialMesh/makeAxialMesh
diff --git a/extend-bazaar/Allwmake b/extend-bazaar/Allwmake
index 0a53da339..aeff431e3 100755
--- a/extend-bazaar/Allwmake
+++ b/extend-bazaar/Allwmake
@@ -9,9 +9,10 @@ if [ ! -d "FluidStructureInteraction" ]; then
     rm Fsi_31.tar.gz
 fi
 
-cd FluidStructureInteraction/src/
-./Allwmake
-cd -
+(
+    cd FluidStructureInteraction/src
+    ./Allwmake
+)
 
 # Install cfMesh mesh generation package
 if [ ! -d "cfMesh-v1.0" ]; then
@@ -23,9 +24,10 @@ fi
 find cfMesh-v1.0/ -type f | grep "Make/files" | xargs sed -i "" -e s/FOAM_LIBBIN/FOAM_USER_LIBBIN/g
 find cfMesh-v1.0/ -type f | grep "Make/files" | xargs sed -i "" -e s/FOAM_APPBIN/FOAM_USER_APPBIN/g
 
-cd cfMesh-v1.0/
-./Allwmake
-cd -
+(
+    cd cfMesh-v1.0
+    ./Allwmake
+)
 
 # Install the makeAxialMesh utilitiy
 if [ ! -d "MakeAxialMesh" ]; then