Fix for ZEN-8975