Implementation for an Issue #715