Implementation for an Issue #678