issue #19314: Fix bugs