Fixed ZEN-13618