Fixed ZEN-11591 issue
Corrected ZEN-11591 issue according to comments
Merge pull request #183 from ssOleg/develop

Fixed ZEN-11591 issue