slightly better matching for folds