Potential fix for #377
Merge pull request #379 from ovatsus/master

Potential fix for #377