Fixed ZEN-10187 issue
Merge pull request #58 from ssOleg/develop

Fixed ZEN-10187 issue