Avoid #382
Merge pull request #385 from ovatsus/master

Avoid #382