issue #19456: bugfix
Merge pull request #39 from shackbarth/19456

issue #19456: bugfix