Fix for multiple clusters