Fix #1679

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

Fix #1679