issue #19494: bugfix