Fix #402
Merge pull request #403 from ovatsus/master

Fix #402