Fix same name directory issue