To fix issue #16137

Signed-off-by: james.lao@gmail.com <james.lao@gmail.com>