issue #20734: Getting really close...