Fix for ZEN-11044