Fix folder duplicate (2)