Fixed ZEN-8583 issue