Implementation for an Issue #507