Fix #1298
Probably needed here too
Merge pull request #1302 from esteldunedain/fix1298

Fix #1298