ZEN-13183 fix.