Map for #340-311.5