Fix #1407
Merge pull request #1410 from Skillert/minor

Fix #1407