Fixed ZEN-9362 issue