issue #19453: removed doublework