Fixed ZEN-10187 issue