Another attempt to fix duplicate tree folders