issue #474