Implementation for an Issue #806