(#1746) - don't use map when we mean forEach