Adapt to changes in Array.find(...)