fix #410
fixes after review
Merge pull request #412 from yandex-ui/fix-410

fix #410