Followup 11f197e
Fix #10922