Moved group fix out of this PR.