Fixed ZEN-8549 issue
Merge pull request #9 from ssOleg/develop

Fixed ZEN-8549 issue