Fix for ZEN-9845