Fix for ZEN-8598