To issue #471