Fix for ZEN-8992