fix #22365
Merge pull request #455 from lvinken/node22312

fix #22365