Implementation for an Issue #450