Attempt to fix subtle grouping bug