Fix for clusters