Fix redeclaration
Merge pull request #745 from tambry/DirNameFix

Fix redeclaration