Fixed ZEN-10586