Fix for an Issue #477