__Map for #530-295