I moved to use DirName it is much better!