slight improvement in handling of clusters