issue #19379: bugfix