Map for #611-304