Fixed ZEN-10165 issue