Fix Cluster connection