extending map_2400 to fix issue #2