Fix 1418
Merge pull request #1425 from Naththo/fix1418

Fix #1418