Fixed ZEN-11384

I will fix this.