Implementation for an Issue #557