issue #20734: Getting closer...