Try to fix making redundent dir problem.