Fixed ZEN-9216 issue