fix FF clustering