Bug-fix, for cases when default-directory is longer than the file-name