Fixes #1981

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

Fixes #1981