Fixed ZEN-12386