UPD: fix issue from 0.5.1 prepare
Merge pull request #1024 from angel-kulikov/master

UPD: fix issue from 0.5.1 prepare