another way of fix for #42400 (#42509)

Commit

17 days ago

another way of fix for #42400 (#42509) * fix * fix --------- Co-authored-by: ydshieh <ydshieh@users.noreply.github.com>