Map for #610-291