Replaced another when.all/map by just when.map