Fixed Issue #10509 (closed)
Signed-off-by: Siu Ching Pong -Asuka Kenji- asukakenji@users.noreply.github.com