Fixed ZEN-11510 issue