Fix for ZEN-13549