fix for none pushd/popd env