Fixed to handle folds properly.