Fix for ZEN-9196