Fixed ZEN-14062 issue