1. fixing issues with map

    Closed
    #160158276 13 9 15 0