fix #20964: take 2