To issue #480