Issue #477