Implementation for an Issue #515