Fix #338
Merge pull request #632 from dr-fozzy/master

Fix #338