Improve huge folds performance