Fix 1412
Merge pull request #1414 from Naththo/fix1412

Fix #1412