Another fix to keypoint clusters