fixed add popd