Implementation for an Issue #496