Fixes ZEN-13580

not just for clusters.