updated for issue #20330