Fix ZEN-9902