__Map for #671-322