pipeline clustering fixup