Fixed ZEN-11419 issue