issue #19550: fixes