Fixed ZEN-9835