Replace outer_fold_step by fold_step