Fixed a race condition in DefaultCluster