Fix conditional default-directory