issue #21989: bugfix