Handle folds better