Fixed ZEN-15403 issue