Fix for issue #5431
Merge pull request #5436 from Seed-Of-Hate/master

Fix for issue #5431