Fixed ZEN-9194 issue