Fixed ZEN-8549 issue