issue #475