Fix for ZEN-9331