Fix PR11985