Fixed duplicate directories