Fixed ZEN-9838