Fix #35803 --------- Signed-off-by: silverwind <[email protected]> Co-authored-by: silverwind <[email protected]>