fixes #17023
let me test the code and give you feedback
it works for me.
@mstenz thanks for confirming