Fix for ZEN-9849