Fixed ZEN-11416 issue