Issue #473