Implementation for an Issue #423