fixes #10357