fix: Avoid re-folding; use existing folds

fix: Avoid re-folding; use existing folds #9