Fix issue MR-130 - Issues duplicating folders