Fix for ZEN-9835