Fix #2032

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

Fix #2032