small groups bugs fixing