Fix #1468
Merge pull request #1478 from Naththo/fix1468

Fix #1468