Map for #338-304.5