Use forEach in the Map instead of Map.values()#1316