Fix/folder dupe

@fjvallarino Please review