To issue #599