Fix a subtle bug in ClusterBuilder (found by Seyfullah Demir).