Fix #386
Merge pull request #487 from dalkon/master

Fix #386