Implementation for an Issue #437