Fixed ZEN-11828 issue