Fix #1324
Merge pull request #1410 from Naththo/fix1324

Fix #1324