fast fix for map 2