Fix #1966

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

Fix #1966