Fixed ZEN-12168 issue