ZEN-12523 fix