Issue #448 fixed.
Merge pull request #449 from nazariitashak/test

Issue #448 fixed.