Fix #2076

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

Fix #2076