Fix #376
Merge pull request #492 from dalkon/master

Fix #376