fix #10358