Fix missing popd