Fix for ZEN-15433