fixup fixing clustering