Fix #10523