Fixed ZEN-11591 issue