Fix multiple map()