Fixed ZEN-11318 issue