Fixed ZEN-14084 issue