Fixed ZEN-9362 issue
Merge pull request #16 from ssOleg/develop

Fixed ZEN-9362 issue