Fixed selection of oldpwd