Map for #648-320.5