Fix ZEN-9330