fix #23557
Merge pull request #554 from Jojo-Schmitz/fix_#23557

fix #23557