fix #21304
Merge pull request #379 from lvinken/21304-capx-2.0

fix #21304