Fixed ZEN-11583 issue