Fix for ZEN-13243