Fix #2070

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

Fix #2070