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