Fixed duplication of directories