Fixed ZEN-9297 issue