Fix for ZEN-9282