Fix #2353

Signed-off-by: Yoshi2889 <rick.2889@gmail.com>
Merge pull request #2354 from Yoshi2889/2353

Fix #2353