Fixed ZEN-11048 issue