fix shell-pop