Issue #1995 suggestion