Fixed ZEN-15127 issue