also fix for new cluster