Fixed ZEN-11058 issue