Implementation for an Issue #596