This should fix #1604

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

This should fix #1604