fix for ZEN-11278