Fix regroup logic