Fixes #667
Merge pull request #668 from lev-kuznetsov/master

Fixes #667