UPD: fix #608
Merge pull request #610 from angel-kulikov/master

UPD: fix #608