Fixed ZEN-14356 issue