fix #20912
Merge pull request #334 from lvinken/20581-capx-impl-3

fix #20912