Implementation for an Issue #874