issue #477