Fix potential race condition with noun approach

Old implmentation did not take into account folds with eventual results.